diff options
Diffstat (limited to 'view')
| -rw-r--r-- | view/theme/redbasic/css/style.css | 2 | ||||
| -rw-r--r-- | view/theme/redbasic/php/theme.php | 2 | ||||
| -rwxr-xr-x | view/tpl/admin_site.tpl | 8 | ||||
| -rwxr-xr-x | view/tpl/install_settings.tpl | 1 | ||||
| -rwxr-xr-x | view/tpl/photo_albums.tpl | 6 | ||||
| -rwxr-xr-x | view/tpl/profile_vcard.tpl | 3 | ||||
| -rwxr-xr-x | view/tpl/profile_vcard_short.tpl | 4 | ||||
| -rw-r--r-- | view/tpl/wiki.tpl | 2 |
8 files changed, 11 insertions, 17 deletions
diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css index d5edc6902..156df07ff 100644 --- a/view/theme/redbasic/css/style.css +++ b/view/theme/redbasic/css/style.css @@ -802,7 +802,7 @@ div.jGrowl div.jGrowl-notification { .contact-block-content { margin-top: 10px; } -.contact-block-img.archived, .app-deleted { +.contact-block-img.archived, .app-deleted, .dim { opacity: 0.3; filter:alpha(opacity=30); } diff --git a/view/theme/redbasic/php/theme.php b/view/theme/redbasic/php/theme.php index a1147a5b4..2b90ae85f 100644 --- a/view/theme/redbasic/php/theme.php +++ b/view/theme/redbasic/php/theme.php @@ -5,7 +5,7 @@ * * Description: Hubzilla standard theme * * Version: 2.1 * * MinVersion: 2.3.1 - * * MaxVersion: 3.0 + * * MaxVersion: 6.0 * * Author: Fabrixxm * * Maintainer: Mike Macgirvin * * Maintainer: Mario Vavti diff --git a/view/tpl/admin_site.tpl b/view/tpl/admin_site.tpl index 0bb3ceb15..6fd0fd9ce 100755 --- a/view/tpl/admin_site.tpl +++ b/view/tpl/admin_site.tpl @@ -51,6 +51,11 @@ {{include file="field_textarea.tpl" field=$banner}} {{include file="field_textarea.tpl" field=$siteinfo}} {{include file="field_textarea.tpl" field=$admininfo}} + + {{include file="field_input.tpl" field=$reply_address}} + {{include file="field_input.tpl" field=$from_email}} + {{include file="field_input.tpl" field=$from_email_name}} + {{include file="field_select.tpl" field=$language}} {{include file="field_select.tpl" field=$theme}} {{include file="field_select.tpl" field=$theme_mobile}} @@ -71,9 +76,6 @@ {{include file="field_select.tpl" field=$access_policy}} <div class="submit"><input type="submit" name="page_site" value="{{$submit}}" /></div> - <h3>{{$upload}}</h3> - {{include file="field_input.tpl" field=$maximagesize}} - <h3>{{$corporate}}</h3> {{include file="field_checkbox.tpl" field=$verify_email}} {{include file="field_checkbox.tpl" field=$feed_contacts}} diff --git a/view/tpl/install_settings.tpl b/view/tpl/install_settings.tpl index f7a0108a8..62dcbb8b3 100755 --- a/view/tpl/install_settings.tpl +++ b/view/tpl/install_settings.tpl @@ -19,7 +19,6 @@ {{include file="field_input.tpl" field=$adminmail}} {{include file="field_input.tpl" field=$siteurl}} -{{include file="field_select.tpl" field=$server_role}} {{include file="field_select_grouped.tpl" field=$timezone}} diff --git a/view/tpl/photo_albums.tpl b/view/tpl/photo_albums.tpl index 4c0bd5a1b..aa78c513a 100755 --- a/view/tpl/photo_albums.tpl +++ b/view/tpl/photo_albums.tpl @@ -1,11 +1,11 @@ <div id="side-bar-photos-albums" class="widget"> <h3>{{$title}}</h3> <ul class="nav nav-pills flex-column"> - <li class="nav-item"><a class="nav-link"href="{{$baseurl}}/photos/{{$nick}}" title="{{$title}}" >Recent Photos</a></li> + <li class="nav-item"><a class="nav-link"href="{{$baseurl}}/photos/{{$nick}}" title="{{$title}}" >{{$recent_photos}}</a></li> {{if $albums}} {{foreach $albums as $al}} - {{if $al.text}} - <li class="nav-item"><a class="nav-link" href="{{$baseurl}}/photos/{{$nick}}/album/{{$al.bin2hex}}"><span class="badge badge-default float-right">{{$al.total}}</span>{{$al.text}}</a></li> + {{if $al.shorttext}} + <li class="nav-item"><a class="nav-link" href="{{$baseurl}}/photos/{{$nick}}/album/{{$al.bin2hex}}"><span class="badge badge-default float-right">{{$al.total}}</span>{{$al.shorttext}}</a></li> {{/if}} {{/foreach}} {{/if}} diff --git a/view/tpl/profile_vcard.tpl b/view/tpl/profile_vcard.tpl index 9bd534fd8..c17a7878c 100755 --- a/view/tpl/profile_vcard.tpl +++ b/view/tpl/profile_vcard.tpl @@ -49,9 +49,6 @@ {{if $homepage}}<dl class="homepage"><dt class="homepage-label">{{$homepage}}</dt><dd class="homepage-url u-url">{{$profile.homepage}}</dd></dl>{{/if}} - {{if $diaspora}} - {{include file="diaspora_vcard.tpl"}} - {{/if}} </div> <div id="clear"></div> diff --git a/view/tpl/profile_vcard_short.tpl b/view/tpl/profile_vcard_short.tpl index 0984a4e5f..5d87d52c6 100755 --- a/view/tpl/profile_vcard_short.tpl +++ b/view/tpl/profile_vcard_short.tpl @@ -30,10 +30,6 @@ {{if $homepage}}<dl class="homepage"><dt class="homepage-label">{{$homepage}}</dt><dd class="homepage-url">{{$profile.homepage}}</dd></dl>{{/if}} - {{if $diaspora}} - {{include file="diaspora_vcard.tpl"}} - {{/if}} - <div id="clear"></div> {{$chanmenu}} diff --git a/view/tpl/wiki.tpl b/view/tpl/wiki.tpl index e54ab9680..564db3324 100644 --- a/view/tpl/wiki.tpl +++ b/view/tpl/wiki.tpl @@ -103,7 +103,7 @@ <script> window.wiki_resource_id = '{{$resource_id}}'; window.wiki_page_name = '{{$page}}'; - window.wiki_page_content = `{{$content}}`; + window.wiki_page_content = '{{$content|escape:'javascript'}}'; window.wiki_page_commit = '{{$commit}}'; $("#generic-modal-ok-{{$wikiModalID}}").removeClass('btn-primary'); |