Merge remote-tracking branch 'upstream/develop' into 1606-time-travel
This commit is contained in:
Michael Vogel
commit
a05f0c39a6
6 changed files with 153 additions and 5 deletions
|
|
@ -399,6 +399,38 @@ function contact_condition() {
|
|||
*/
|
||||
function item_fieldlist() {
|
||||
|
||||
/*
|
||||
These Fields are not added below (yet). They are here to for bug search.
|
||||
`item`.`type`,
|
||||
`item`.`extid`,
|
||||
`item`.`received`,
|
||||
`item`.`changed`,
|
||||
`item`.`author-avatar`,
|
||||
`item`.`object`,
|
||||
`item`.`target-type`,
|
||||
`item`.`target`,
|
||||
`item`.`resource-id`,
|
||||
`item`.`tag`,
|
||||
`item`.`attach`,
|
||||
`item`.`inform`,
|
||||
`item`.`file`,
|
||||
`item`.`pubmail`,
|
||||
`item`.`moderated`,
|
||||
`item`.`visible`,
|
||||
`item`.`spam`,
|
||||
`item`.`starred`,
|
||||
`item`.`bookmark`,
|
||||
`item`.`unseen`,
|
||||
`item`.`deleted`,
|
||||
`item`.`origin`,
|
||||
`item`.`forum_mode`,
|
||||
`item`.`last-child`,
|
||||
`item`.`mention`,
|
||||
`item`.`global`,
|
||||
`item`.`gcontact-id`,
|
||||
`item`.`shadow`,
|
||||
*/
|
||||
|
||||
$fieldlist = "`item`.`author-link`, `item`.`verb`, `item`.`id`, `item`.`parent`,
|
||||
`item`.`uid`, `item`.`author-name`, `item`.`location`, `item`.`coord`,
|
||||
`item`.`title`, `item`.`uri`, `item`.`created`, `item`.`app`, `item`.`guid`,
|
||||
|
|
@ -407,7 +439,7 @@ function item_fieldlist() {
|
|||
`item`.`allow_cid`, `item`.`allow_gid`, `item`.`deny_cid`, `item`.`deny_gid`,
|
||||
`item`.`event-id`, `item`.`object-type`, `item`.`starred`, `item`.`created`,
|
||||
`item`.`postopts`, `item`.`owner-link`, `item`.`owner-name`, `item`.`owner-avatar`,
|
||||
`item`.`plink`, `item`.`wall`,
|
||||
`item`.`plink`, `item`.`wall`, `item`.`commented`,
|
||||
`item`.`id` AS `item_id`, `item`.`network` AS `item_network`";
|
||||
|
||||
return $fieldlist;
|
||||
|
|
|
|||
|
|
@ -989,6 +989,9 @@ function settings_content(&$a) {
|
|||
'$infinite_scroll' => array('infinite_scroll', t("Infinite scroll"), $infinite_scroll, ''),
|
||||
'$no_auto_update' => array('no_auto_update', t("Automatic updates only at the top of the network page"), $no_auto_update, 'When disabled, the network page is updated all the time, which could be confusing while reading.'),
|
||||
|
||||
'$d_tset' => t('General Theme Settings'),
|
||||
'$d_ctset' => t('Custom Theme Settings'),
|
||||
'$d_cset' => t('Content Settings'),
|
||||
'stitle' => t('Theme settings'),
|
||||
'$theme_config' => $theme_config,
|
||||
));
|
||||
|
|
|
|||
|
|
@ -1018,6 +1018,15 @@ aside #group-sidebar .sidebar-group-li .group-edit-tool:hover,
|
|||
aside #saved-search-list .saved-search-li .savedsearchdrop:hover {
|
||||
opacity: 1;
|
||||
}
|
||||
aside #group-sidebar li .group-checkbox {
|
||||
margin: 0;
|
||||
}
|
||||
aside #group-sidebar li .group-edit-tool {
|
||||
padding-right: 10px;
|
||||
}
|
||||
aside #group-sidebar li .group-edit-tool:first-child {
|
||||
padding-right: 0px;
|
||||
}
|
||||
|
||||
/* contact block widget */
|
||||
#contact-block .contact-block-content {
|
||||
|
|
|
|||
104
view/theme/frio/templates/settings_display.tpl
Normal file
104
view/theme/frio/templates/settings_display.tpl
Normal file
|
|
@ -0,0 +1,104 @@
|
|||
|
||||
<div class="generic-page-wrapper">
|
||||
{{* include the title template for the settings title *}}
|
||||
{{include file="section_title.tpl" title=$ptitle }}
|
||||
|
||||
|
||||
<form action="settings/display" id="settings-form" method="post" autocomplete="off" >
|
||||
<input type='hidden' name='form_security_token' value='{{$form_security_token}}'>
|
||||
|
||||
<div class="panel-group panel-group-settings" id="settings" role="tablist" aria-multiselectable="true">
|
||||
<div class="panel">
|
||||
<div class="section-subtitle-wrapper" role="tab" id="theme-settings-title">
|
||||
<h4>
|
||||
<a class="accordion-toggle collapsed" data-toggle="collapse" data-parent="#settings" href="#theme-settings-content" aria-expanded="true" aria-controls="theme-settings-content">
|
||||
{{$d_tset}}
|
||||
</a>
|
||||
</h4>
|
||||
</div>
|
||||
|
||||
<div id="theme-settings-content" class="panel-collapse collapse" role="tabpanel" aria-labelledby="theme-settings">
|
||||
<div class="section-content-tools-wrapper">
|
||||
|
||||
{{include file="field_themeselect.tpl" field=$theme}}
|
||||
|
||||
{{include file="field_themeselect.tpl" field=$mobile_theme}}
|
||||
|
||||
<div class="form-group pull-right settings-submit-wrapper" >
|
||||
<button type="submit" name="submit" class="btn btn-primary" value="{{$submit|escape:'html'}}">{{$submit}}</button>
|
||||
</div>
|
||||
<div class="clear"></div>
|
||||
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="panel">
|
||||
<div class="section-subtitle-wrapper" role="tab" id="custom-settings-title">
|
||||
<h4>
|
||||
<a class="accordion-toggle collapsed" data-toggle="collapse" data-parent="#settings" href="#custom-settings-content" aria-expanded="true" aria-controls="custom-settings-content">
|
||||
{{$d_ctset}}
|
||||
</a>
|
||||
</h4>
|
||||
</div>
|
||||
<div id="custom-settings-content" class="panel-collapse collapse{{if !$theme && !$mobile_theme}} in{{/if}}" role="tabpanel" aria-labelledby="custom-settings">
|
||||
<div class="section-content-tools-wrapper">
|
||||
|
||||
{{if $theme_config}}
|
||||
{{$theme_config}}
|
||||
{{/if}}
|
||||
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="panel">
|
||||
<div class="section-subtitle-wrapper" role="tab" id="content-settings-title">
|
||||
<h4>
|
||||
<a class="accordion-toggle collapsed" data-toggle="collapse" data-parent="#settings" href="#content-settings-content" aria-expanded="true" aria-controls="content-settings-content">
|
||||
{{$d_cset}}
|
||||
</a>
|
||||
</h4>
|
||||
</div>
|
||||
<div id="content-settings-content" class="panel-collapse collapse{{if !$theme && !$mobile_theme && !$theme_config}} in{{/if}}" role="tabpanel" aria-labelledby="content-settings">
|
||||
<div class="section-content-wrapper">
|
||||
|
||||
{{include file="field_input.tpl" field=$itemspage_network}}
|
||||
{{include file="field_input.tpl" field=$itemspage_mobile_network}}
|
||||
{{include file="field_input.tpl" field=$ajaxint}}
|
||||
{{include file="field_checkbox.tpl" field=$no_auto_update}}
|
||||
{{include file="field_checkbox.tpl" field=$nosmile}}
|
||||
{{include file="field_checkbox.tpl" field=$noinfo}}
|
||||
{{include file="field_checkbox.tpl" field=$infinite_scroll}}
|
||||
|
||||
<div class="form-group pull-right settings-submit-wrapper" >
|
||||
<button type="submit" name="submit" class="btn btn-primary" value="{{$submit|escape:'html'}}">{{$submit}}</button>
|
||||
</div>
|
||||
<div class="clear"></div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="panel">
|
||||
<div class="section-subtitle-wrapper" role="tab" id="calendar-settings-title">
|
||||
<h4>
|
||||
<a class="accordion-toggle collapsed" data-toggle="collapse" data-parent="#settings" href="#calendar-settings-content" aria-expanded="true" aria-controls="calendar-settings-content">
|
||||
{{$calendar_title}}
|
||||
</a>
|
||||
</h4>
|
||||
</div>
|
||||
<div id="calendar-settings-content" class="panel-collapse collapse{{if !$theme && !$mobile_theme && !$theme_config}} in{{/if}}" role="tabpanel" aria-labelledby="calendar-settings">
|
||||
<div class="section-content-wrapper">
|
||||
|
||||
{{include file="field_select.tpl" field=$first_day_of_week}}
|
||||
|
||||
<div class="form-group pull-right settings-submit-wrapper" >
|
||||
<button type="submit" name="submit" class="btn btn-primary" value="{{$submit|escape:'html'}}">{{$submit}}</button>
|
||||
</div>
|
||||
<div class="clear"></div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</form>
|
||||
</div>
|
||||
|
|
@ -63,8 +63,8 @@
|
|||
});
|
||||
</script>
|
||||
|
||||
<div class="settings-submit-wrapper pull-right">
|
||||
<button type="submit" value="{{$submit}}" class="settings-submit btn btn-primary" name="frio-settings-submit"><i class="fa fa-slideshare"></i> {{$submit}}</button>
|
||||
<div class="settings-submit-wrapper form-group pull-right">
|
||||
<button type="submit" value="{{$submit}}" class="settings-submit btn btn-primary" name="frio-settings-submit">{{$submit}}</button>
|
||||
</div>
|
||||
<div class="clearfix"></div>
|
||||
|
||||
|
|
|
|||
|
|
@ -1,8 +1,8 @@
|
|||
<?php
|
||||
/*
|
||||
* Name: frio
|
||||
* Description: Bootstrap V3 theme. The theme is currently under construction, so it is far from finished. For further information have a look at the <a href="https://github.com/rabuzarus/frio/blob/master/README.md">ReadMe</a> and <a href="https://github.com/rabuzarus/frio">GitHub</a>.
|
||||
* Version: V.0.1 Alpha
|
||||
* Description: Bootstrap V3 theme. The theme is currently under construction, so it is far from finished. For further information have a look at the <a href="https://github.com/friendica/friendica/tree/develop/view/theme/frio/README.md">ReadMe</a>.
|
||||
* Version: V.0.2 Alpha
|
||||
* Author: Rabuzarus <https://friendica.kommune4.de/profile/rabuzarus>
|
||||
*
|
||||
*/
|
||||
|
|
|
|||
Loading…
Reference in a new issue