diff options
| author | Thomas Willingham <founder@kakste.com> | 2012-12-18 16:59:08 +0000 |
|---|---|---|
| committer | Thomas Willingham <founder@kakste.com> | 2012-12-18 16:59:08 +0000 |
| commit | d9194fdb5a6709eba8f47795dd5367d79ad0e367 (patch) | |
| tree | 86a91ec7a556310400c2eb26d45bbeb108486b36 /view/tpl | |
| parent | 2cb2896916ce98f16b891634fddcbd403c55d95f (diff) | |
| parent | e9b5b0f0b424930b87708080c4e6ce671016177b (diff) | |
| download | volse-hubzilla-d9194fdb5a6709eba8f47795dd5367d79ad0e367.tar.gz volse-hubzilla-d9194fdb5a6709eba8f47795dd5367d79ad0e367.tar.bz2 volse-hubzilla-d9194fdb5a6709eba8f47795dd5367d79ad0e367.zip | |
Merge remote-tracking branch 'upstream/master'
Conflicts:
view/theme/redbasic/css/style.css
Diffstat (limited to 'view/tpl')
| -rw-r--r-- | view/tpl/contact_block.tpl | 2 | ||||
| -rw-r--r-- | view/tpl/conv_frame.tpl | 3 | ||||
| -rw-r--r-- | view/tpl/head.tpl | 2 | ||||
| -rw-r--r-- | view/tpl/profile_vcard.tpl | 2 | ||||
| -rw-r--r-- | view/tpl/settings_display.tpl | 2 |
5 files changed, 7 insertions, 4 deletions
diff --git a/view/tpl/contact_block.tpl b/view/tpl/contact_block.tpl index a79648712..a623c4944 100644 --- a/view/tpl/contact_block.tpl +++ b/view/tpl/contact_block.tpl @@ -1,5 +1,5 @@ <div id="contact-block"> -<h4 class="contact-block-h4">$contacts</h4> +<div id="contact-block-numcontacts">$contacts</div> {{ if $micropro }} <a class="allcontact-link" href="viewcontacts/$nickname">$viewcontacts</a> <div class='contact-block-content'> diff --git a/view/tpl/conv_frame.tpl b/view/tpl/conv_frame.tpl index ed3e87050..202b095e7 100644 --- a/view/tpl/conv_frame.tpl +++ b/view/tpl/conv_frame.tpl @@ -9,3 +9,6 @@ </div> <div id="item-delete-selected-end"></div> {{ endif }} + +<img id="page-spinner" src="images/rotator.gif" alt="$wait" title="$wait" style="display: none;" /> + diff --git a/view/tpl/head.tpl b/view/tpl/head.tpl index 9c0e6b09a..632ab21ca 100644 --- a/view/tpl/head.tpl +++ b/view/tpl/head.tpl @@ -12,7 +12,7 @@ $js_strings $head_js -<link rel="shortcut icon" href="$baseurl/images/fred-32.png" /> +<link rel="shortcut icon" href="$baseurl/images/red.png" /> <link rel="search" href="$baseurl/opensearch" type="application/opensearchdescription+xml" diff --git a/view/tpl/profile_vcard.tpl b/view/tpl/profile_vcard.tpl index 7ae62330c..51e3a4028 100644 --- a/view/tpl/profile_vcard.tpl +++ b/view/tpl/profile_vcard.tpl @@ -48,7 +48,7 @@ </div> - +<div id="vcard-end"></div> $contact_block diff --git a/view/tpl/settings_display.tpl b/view/tpl/settings_display.tpl index 24fc11027..2aac64515 100644 --- a/view/tpl/settings_display.tpl +++ b/view/tpl/settings_display.tpl @@ -6,7 +6,7 @@ {{inc field_themeselect.tpl with $field=$theme }}{{endinc}} {{inc field_themeselect.tpl with $field=$mobile_theme }}{{endinc}} {{inc field_input.tpl with $field=$ajaxint }}{{endinc}} -{{inc field_input.tpl with $field=$itemspage_network }}{{endinc}} +{{inc field_input.tpl with $field=$itemspage }}{{endinc}} {{inc field_checkbox.tpl with $field=$nosmile}}{{endinc}} |