diff options
| author | Paolo T <tuscanhobbit@users.noreply.github.com> | 2014-10-12 09:15:39 +0200 |
|---|---|---|
| committer | Paolo T <tuscanhobbit@users.noreply.github.com> | 2014-10-12 09:15:39 +0200 |
| commit | 56f6f696bd5dd5b8120d562d9f43fe94d8e6dd41 (patch) | |
| tree | c1376be525c85ab799f213ed79648d8c478da3d0 /view/tpl | |
| parent | 9edaa2843b9982f52fb1ed93b1c6e3d9e53921d7 (diff) | |
| parent | 44c4c9c5c271a5ad163a089b1dc271d108a59700 (diff) | |
| download | volse-hubzilla-56f6f696bd5dd5b8120d562d9f43fe94d8e6dd41.tar.gz volse-hubzilla-56f6f696bd5dd5b8120d562d9f43fe94d8e6dd41.tar.bz2 volse-hubzilla-56f6f696bd5dd5b8120d562d9f43fe94d8e6dd41.zip | |
Merge pull request #6 from tuscanhobbit/master
Fast forward local hub
Diffstat (limited to 'view/tpl')
39 files changed, 78 insertions, 46 deletions
diff --git a/view/tpl/abook_edit.tpl b/view/tpl/abook_edit.tpl index 95285ac79..078eb4df4 100755 --- a/view/tpl/abook_edit.tpl +++ b/view/tpl/abook_edit.tpl @@ -1,4 +1,4 @@ -<div class="generic-content-wrapper"> +<div class="generic-content-wrapper-styled"> <h2>{{$header}}</h2> <h3>{{$addr}}</h3> diff --git a/view/tpl/admin_aside.tpl b/view/tpl/admin_aside.tpl index b1838ece1..2ab3edcc2 100755 --- a/view/tpl/admin_aside.tpl +++ b/view/tpl/admin_aside.tpl @@ -10,6 +10,7 @@ }); }); </script> +<div class="widget"> <h3>{{$admtxt}}</h3> <ul class="nav nav-pills nav-stacked"> <li><a href='{{$admin.site.0}}'>{{$admin.site.1}}</a></li> @@ -20,6 +21,7 @@ <li><a href='{{$admin.hubloc.0}}'>{{$admin.hubloc.1}}</a></li> <li><a href='{{$admin.dbsync.0}}'>{{$admin.dbsync.1}}</a></li> </ul> +</div> {{if $admin.update}} <ul class="nav nav-pills nav-stacked"> @@ -29,16 +31,20 @@ {{/if}} -{{if $admin.plugins_admin}}<h3>{{$plugadmtxt}}</h3>{{/if}} +{{if $admin.plugins_admin}} +<div class="widget"> +<h3>{{$plugadmtxt}}</h3> <ul class="nav nav-pills nav-stacked"> {{foreach $admin.plugins_admin as $l}} <li><a href='{{$l.0}}'>{{$l.1}}</a></li> {{/foreach}} </ul> +</div> +{{/if}} - +<div class="widget"> <h3>{{$logtxt}}</h3> <ul class="nav nav-pills nav-stacked"> <li><a href='{{$admin.logs.0}}'>{{$admin.logs.1}}</a></li> </ul> - +</div> diff --git a/view/tpl/admin_channels.tpl b/view/tpl/admin_channels.tpl index b26e67687..817eb939a 100755 --- a/view/tpl/admin_channels.tpl +++ b/view/tpl/admin_channels.tpl @@ -10,7 +10,7 @@ return false; } </script> -<div class = "generic-content-wrapper" id='adminpage'> +<div class = "generic-content-wrapper-styled" id='adminpage'> <h1>{{$title}} - {{$page}}</h1> <form action="{{$baseurl}}/admin/channels" method="post"> diff --git a/view/tpl/admin_hubloc.tpl b/view/tpl/admin_hubloc.tpl index 06a8cdf6a..1bd1f0122 100755 --- a/view/tpl/admin_hubloc.tpl +++ b/view/tpl/admin_hubloc.tpl @@ -1,4 +1,4 @@ -<div class="generic-content-wrapper" id='adminpage'> +<div class="generic-content-wrapper-styled" id='adminpage'> <h1>{{$title}} - {{$page}}</h1> <table id='server'> diff --git a/view/tpl/admin_logs.tpl b/view/tpl/admin_logs.tpl index 3d2adc660..6d2d7834c 100755 --- a/view/tpl/admin_logs.tpl +++ b/view/tpl/admin_logs.tpl @@ -1,4 +1,4 @@ -<div class="generic-content-wrapper" id='adminpage'> +<div class="generic-content-wrapper-styled" id='adminpage'> <h1>{{$title}} - {{$page}}</h1> <form action="{{$baseurl}}/admin/logs" method="post"> diff --git a/view/tpl/admin_plugins.tpl b/view/tpl/admin_plugins.tpl index 40821c534..0f76cc4fe 100755 --- a/view/tpl/admin_plugins.tpl +++ b/view/tpl/admin_plugins.tpl @@ -1,4 +1,4 @@ -<div class="generic-content-wrapper" id='adminpage'> +<div class="generic-content-wrapper-styled" id='adminpage'> <h1>{{$title}} - {{$page}}</h1> <ul id='pluginslist'> diff --git a/view/tpl/admin_plugins_details.tpl b/view/tpl/admin_plugins_details.tpl index 1c1a59879..bdcc82c08 100755 --- a/view/tpl/admin_plugins_details.tpl +++ b/view/tpl/admin_plugins_details.tpl @@ -1,4 +1,4 @@ -<div class = "generic-content-wrapper" id='adminpage'> +<div class = "generic-content-wrapper-styled" id='adminpage'> <h1>{{$title}} - {{$page}}</h1> <p><i class='toggleplugin {{if $status==on}}icon-check{{else}}icon-check-empty{{/if}} admin-icons'></i> {{$info.name}} - {{$info.version}} : <a href="{{$baseurl}}/admin/{{$function}}/{{$plugin}}/?a=t&t={{$form_security_token}}">{{$action}}</a></p> diff --git a/view/tpl/admin_site.tpl b/view/tpl/admin_site.tpl index 56485dff6..8c62cb80f 100755 --- a/view/tpl/admin_site.tpl +++ b/view/tpl/admin_site.tpl @@ -34,7 +34,7 @@ }); }); </script> -<div id="adminpage" class="generic-content-wrapper"> +<div id="adminpage" class="generic-content-wrapper-styled"> <h1>{{$title}} - {{$page}}</h1> <form action="{{$baseurl}}/admin/site" method="post"> diff --git a/view/tpl/admin_summary.tpl b/view/tpl/admin_summary.tpl index 24cdd57cc..7f752a773 100755 --- a/view/tpl/admin_summary.tpl +++ b/view/tpl/admin_summary.tpl @@ -1,4 +1,4 @@ -<div class="generic-content-wrapper" id='adminpage'> +<div class="generic-content-wrapper-styled" id='adminpage'> <h1>{{$title}} - {{$page}}</h1> <dl> diff --git a/view/tpl/admin_users.tpl b/view/tpl/admin_users.tpl index 65fffd17c..5bf64b4df 100755 --- a/view/tpl/admin_users.tpl +++ b/view/tpl/admin_users.tpl @@ -10,7 +10,7 @@ return false; } </script> -<div class = "generic-content-wrapper" id='adminpage'> +<div class = "generic-content-wrapper-styled" id='adminpage'> <h1>{{$title}} - {{$page}}</h1> <form action="{{$baseurl}}/admin/users" method="post"> diff --git a/view/tpl/channels.tpl b/view/tpl/channels.tpl index 2c31cb498..0dec68a53 100755 --- a/view/tpl/channels.tpl +++ b/view/tpl/channels.tpl @@ -1,6 +1,6 @@ +<div class="generic-content-wrapper-styled"> <h3>{{$header}}</h3> - {{if $links}} {{foreach $links as $l}} <a class="channels-links" href="{{$l.0}}" title="{{$l.1}}">{{$l.2}}</a> @@ -30,3 +30,5 @@ </div> <div class="channels-end all"></div> + +</div> diff --git a/view/tpl/cloud_actionspanel.tpl b/view/tpl/cloud_actionspanel.tpl index 69931b292..00f243c1e 100644 --- a/view/tpl/cloud_actionspanel.tpl +++ b/view/tpl/cloud_actionspanel.tpl @@ -1,3 +1,5 @@ +<div class="generic-content-wrapper-styled"> + <table> <tr> <td><strong>{{$folder_header}}</strong> </td> @@ -20,4 +22,6 @@ </form> </td> </tr> -</table>
\ No newline at end of file +</table> + +</div> diff --git a/view/tpl/cloud_directory.tpl b/view/tpl/cloud_directory.tpl index 5d22e4a16..639a6bf61 100644 --- a/view/tpl/cloud_directory.tpl +++ b/view/tpl/cloud_directory.tpl @@ -1,3 +1,4 @@ +<div class="generic-content-wrapper-styled"> <h1>{{$header}}</h1> <table id="cloud-index"> <tr> @@ -40,4 +41,5 @@ {{if $quota.limit || $quota.used}} <p><strong>{{$total}}</strong> {{$quota.desc}}</p> -{{/if}}
\ No newline at end of file +{{/if}} +</div> diff --git a/view/tpl/connections.tpl b/view/tpl/connections.tpl index 1429576b1..8e5266978 100755 --- a/view/tpl/connections.tpl +++ b/view/tpl/connections.tpl @@ -1,3 +1,5 @@ +<div class="generic-content-wrapper-styled"> + <h1>{{$header}}{{if $total}} ({{$total}}){{/if}}</h1> {{if $finding}}<h4>{{$finding}}</h4>{{/if}} @@ -20,10 +22,6 @@ <div id="page-end"></div> </div> <div id="contact-edit-end"></div> +</div> <script>$(document).ready(function() { loadingPage = false;});</script> <div id="page-spinner"></div> - - - - - diff --git a/view/tpl/directory_header.tpl b/view/tpl/directory_header.tpl index 01356597e..477df8a63 100755 --- a/view/tpl/directory_header.tpl +++ b/view/tpl/directory_header.tpl @@ -1,3 +1,4 @@ +<div class="generic-content-wrapper-styled"> <h1>{{$dirlbl}}</h1> {{if $search}} @@ -8,9 +9,8 @@ {{include file="direntry.tpl"}} {{/foreach}} - <div id="page-end"></div> <div class="directory-end"></div> +</div> <script>$(document).ready(function() { loadingPage = false;});</script> <div id="page-spinner"></div> - diff --git a/view/tpl/direntry.tpl b/view/tpl/direntry.tpl index e5f12944e..a6252bb9a 100755 --- a/view/tpl/direntry.tpl +++ b/view/tpl/direntry.tpl @@ -1,5 +1,4 @@ <div class="directory-item lframe" id="directory-item-{{$entry.id}}" > -<div class="generic-content-wrapper"> <div class="contact-photo-wrapper" id="directory-photo-wrapper-{{$entry.id}}" > <div class="contact-photo" id="directory-photo-{{$entry.id}}" > @@ -13,4 +12,3 @@ {{/if}} <div class="contact-details">{{$entry.details}}</div> </div> -</div> diff --git a/view/tpl/event_form.tpl b/view/tpl/event_form.tpl index b2455e26c..2a580e3b8 100755 --- a/view/tpl/event_form.tpl +++ b/view/tpl/event_form.tpl @@ -1,3 +1,5 @@ +<div class="generic-content-wrapper-styled"> + <h3>{{$title}}</h3> <p> @@ -147,4 +149,4 @@ }); }); </script> - +</div> diff --git a/view/tpl/events-js.tpl b/view/tpl/events-js.tpl index c87d20529..69a248512 100755 --- a/view/tpl/events-js.tpl +++ b/view/tpl/events-js.tpl @@ -1,6 +1,8 @@ {{$tabs}} +<div class="generic-content-wrapper-styled"> <h2>{{$title}}</h2> <div id="new-event-link"><a href="{{$new_event.0}}" >{{$new_event.1}}</a></div> <div id="events-calendar"></div> +</div> diff --git a/view/tpl/failed_updates.tpl b/view/tpl/failed_updates.tpl index 68c0bcdf2..f53f1f478 100755 --- a/view/tpl/failed_updates.tpl +++ b/view/tpl/failed_updates.tpl @@ -1,3 +1,4 @@ +<div class="generic-content-wrapper-styled"> <h2>{{$banner}}</h2> <div id="failed_updates_desc">{{$desc}}</div> @@ -14,4 +15,4 @@ <hr /> {{/foreach}} {{/if}} - +</div> diff --git a/view/tpl/menulist.tpl b/view/tpl/menulist.tpl index 271bace82..2feb75d90 100644 --- a/view/tpl/menulist.tpl +++ b/view/tpl/menulist.tpl @@ -1,3 +1,5 @@ +<div class="generic-content-wrapper-styled"> + <h1>{{$title}}</h1> <a href="menu/new" title="{{$hintnew}}">{{$hintnew}}</a> @@ -12,5 +14,4 @@ </ul> {{/if}} - - +</div> diff --git a/view/tpl/notifications.tpl b/view/tpl/notifications.tpl index 285efbae0..0b24da7c3 100755 --- a/view/tpl/notifications.tpl +++ b/view/tpl/notifications.tpl @@ -1,7 +1,11 @@ +<div class="generic-content-wrapper-styled"> + <h1>{{$notif_header}}</h1> + {{if $notifications_available}} <a href="#" onclick="markRead('notify'); setTimeout(function() { window.location.href=window.location.href; },1500); return false;">{{$notif_link_mark_seen}}</a> {{/if}} <div class="notif-network-wrapper"> {{$notif_content}} </div> +</div> diff --git a/view/tpl/photo_album.tpl b/view/tpl/photo_album.tpl index d23f7e817..0c878b950 100755 --- a/view/tpl/photo_album.tpl +++ b/view/tpl/photo_album.tpl @@ -12,7 +12,7 @@ <div class="clear"></div> </div> -<div id="photo-album-contents"> +<div id="photo-album-contents" class="generic-content-wrapper"> {{foreach $photos as $photo}} {{include file="photo_top.tpl"}} {{/foreach}} diff --git a/view/tpl/photo_view.tpl b/view/tpl/photo_view.tpl index a0ca7e0f9..f895b3129 100755 --- a/view/tpl/photo_view.tpl +++ b/view/tpl/photo_view.tpl @@ -1,4 +1,5 @@ <div id="live-photos"></div> +<div class="generic-content-wrapper-styled"> <h3><a href="{{$album.0}}">{{$album.1}}</a></h3> <div id="photo-edit-link-wrap"> @@ -97,5 +98,7 @@ <div class="clear"></div> +</div> + {{$paginate}} diff --git a/view/tpl/photos_recent.tpl b/view/tpl/photos_recent.tpl index 6b0f555b6..91b088c93 100755 --- a/view/tpl/photos_recent.tpl +++ b/view/tpl/photos_recent.tpl @@ -5,7 +5,7 @@ <h2>{{$title}}</h2> <div class="clear"></div> </div> -<div id="photo-album-contents"> +<div id="photo-album-contents" class="generic-content-wrapper"> {{foreach $photos as $photo}} {{include file="photo_top.tpl"}} {{/foreach}} diff --git a/view/tpl/photos_upload.tpl b/view/tpl/photos_upload.tpl index c0e891547..81d7b6dc0 100755 --- a/view/tpl/photos_upload.tpl +++ b/view/tpl/photos_upload.tpl @@ -4,7 +4,8 @@ <div class="clear"></div> </div> -<form action="photos/{{$nickname}}" enctype="multipart/form-data" method="post" name="photos-upload-form" id="photos-upload-form" > +<div class="generic-content-wrapper-styled"> +<form action="photos/{{$nickname}}" enctype="multipart/form-data" method="post" name="photos-upload-form" id="photos-upload-form"> <input type="hidden" id="photos-upload-source" name="source" value="photos" /> <div id="photos-upload-new-wrapper" > <div id="photos-upload-newalbum-div"> @@ -40,4 +41,4 @@ <div class="photos-upload-end" ></div> </form> - +</div> diff --git a/view/tpl/profile_advanced.tpl b/view/tpl/profile_advanced.tpl index cbb078710..aa169e6c0 100755 --- a/view/tpl/profile_advanced.tpl +++ b/view/tpl/profile_advanced.tpl @@ -1,4 +1,4 @@ -<div id="profile-content-wrapper" class="generic-content-wrapper"> +<div id="profile-content-wrapper" class="generic-content-wrapper-styled"> <h2>{{$title}}</h2> {{if $profile.canlike || $profile.like_count}} diff --git a/view/tpl/profile_edit.tpl b/view/tpl/profile_edit.tpl index b453b1cfa..535aa19dd 100755 --- a/view/tpl/profile_edit.tpl +++ b/view/tpl/profile_edit.tpl @@ -1,4 +1,4 @@ -{{if $is_default}} +<div class="generic-content-wrapper-styled">{{if $is_default}} <p id="profile-edit-default-desc">{{$default}}</p> {{/if}} @@ -363,4 +363,5 @@ </form> </div> +</div> diff --git a/view/tpl/profile_entry.tpl b/view/tpl/profile_entry.tpl index cc0f3477c..ab81a7fbc 100755 --- a/view/tpl/profile_entry.tpl +++ b/view/tpl/profile_entry.tpl @@ -1,3 +1,4 @@ +<div class="generic-content-wrapper-styled"> <div class="profile-listing" > <div class="profile-listing-photo-wrapper" > <a href="profiles/{{$id}}" class="profile-listing-edit-link"><img class="profile-listing-photo" id="profile-listing-photo-{{$id}}" src="{{$photo}}" alt="{{$alt}}" /></a> @@ -7,4 +8,4 @@ <div class="profile-listing-visible">{{$visible}}</div> </div> <div class="profile-listing-end"></div> - +</div> diff --git a/view/tpl/profile_listing_header.tpl b/view/tpl/profile_listing_header.tpl index c4bc367ba..09d00f982 100755 --- a/view/tpl/profile_listing_header.tpl +++ b/view/tpl/profile_listing_header.tpl @@ -1,3 +1,4 @@ +<div class="generic-content-wrapper-styled"> <h1>{{$header}}</h1> <p id="profile-listing-desc" class="btn btn-default" > <a href="profile_photo" >{{$chg_photo}}</a> @@ -8,4 +9,3 @@ <p id="profile-listing-new-link-wrapper" class="btn btn-default" > <a href="{{$cr_new_link}}" id="profile-listing-new-link" title="{{$cr_new}}" >{{$cr_new}}</a> </div> - diff --git a/view/tpl/settings.tpl b/view/tpl/settings.tpl index 1340a1653..07a37f773 100755 --- a/view/tpl/settings.tpl +++ b/view/tpl/settings.tpl @@ -1,4 +1,4 @@ -<div class="generic-content-wrapper"> +<div class="generic-content-wrapper-styled"> <h1>{{$ptitle}}</h1> {{$nickname_block}} diff --git a/view/tpl/settings_account.tpl b/view/tpl/settings_account.tpl index 1e28d8b84..36bb494d8 100755 --- a/view/tpl/settings_account.tpl +++ b/view/tpl/settings_account.tpl @@ -1,4 +1,4 @@ -<div class="generic-content-wrapper"> +<div class="generic-content-wrapper-styled"> <h1>{{$title}}</h1> diff --git a/view/tpl/settings_addons.tpl b/view/tpl/settings_addons.tpl index 3e447cd0a..f0d5195bf 100755 --- a/view/tpl/settings_addons.tpl +++ b/view/tpl/settings_addons.tpl @@ -1,4 +1,4 @@ -<div class="generic-content-wrapper"> +<div class="generic-content-wrapper-styled"> <h1>{{$title}}</h1> diff --git a/view/tpl/settings_connectors.tpl b/view/tpl/settings_connectors.tpl index a8bde4c1e..8bea9ca63 100755 --- a/view/tpl/settings_connectors.tpl +++ b/view/tpl/settings_connectors.tpl @@ -1,3 +1,4 @@ +<div class="generic-content-wrapper-styled"> <h1>{{$title}}</h1> <form action="settings/connectors" method="post" autocomplete="off"> @@ -6,4 +7,4 @@ {{$settings_connectors}} </form> - +</div> diff --git a/view/tpl/settings_display.tpl b/view/tpl/settings_display.tpl index f10f2e1c2..d3134ea88 100755 --- a/view/tpl/settings_display.tpl +++ b/view/tpl/settings_display.tpl @@ -1,4 +1,4 @@ -<div class="generic-content-wrapper"> +<div class="generic-content-wrapper-styled"> <h1>{{$ptitle}}</h1> <form action="settings/display" id="settings-form" method="post" autocomplete="off" > diff --git a/view/tpl/settings_features.tpl b/view/tpl/settings_features.tpl index a03817f82..3291162fa 100755 --- a/view/tpl/settings_features.tpl +++ b/view/tpl/settings_features.tpl @@ -1,4 +1,4 @@ -<div class="generic-content-wrapper"> +<div class="generic-content-wrapper-styled"> <h1>{{$title}}</h1> diff --git a/view/tpl/settings_oauth.tpl b/view/tpl/settings_oauth.tpl index 9be0035ff..f7b4a0b1a 100755 --- a/view/tpl/settings_oauth.tpl +++ b/view/tpl/settings_oauth.tpl @@ -1,4 +1,4 @@ -<div class="generic-content-wrapper"> +<div class="generic-content-wrapper-styled"> <h1>{{$title}}</h1> diff --git a/view/tpl/siteinfo.tpl b/view/tpl/siteinfo.tpl index d956a7228..a6105227e 100755 --- a/view/tpl/siteinfo.tpl +++ b/view/tpl/siteinfo.tpl @@ -4,6 +4,9 @@ {{if $version}} <p>{{$version}}{{if $commit}}+{{$commit}}{{/if}}</p> {{/if}} +{{if $tag}} +<p>Tag: {{$tag}}</p> +{{/if}} <p>{{$web_location}}</p> <p>{{$visit}}</p> <p>{{$bug_text}} <a href="{{$bug_link_url}}">{{$bug_link_text}}</a></p> diff --git a/view/tpl/viewcontact_template.tpl b/view/tpl/viewcontact_template.tpl index 18fed6bb4..cde24525c 100755 --- a/view/tpl/viewcontact_template.tpl +++ b/view/tpl/viewcontact_template.tpl @@ -1,3 +1,4 @@ +<div class="generic-content-wrapper generic-content-wrapper-styled"> <h3>{{$title}}</h3> {{foreach $contacts as $contact}} @@ -5,5 +6,5 @@ {{/foreach}} <div id="view-contact-end"></div> - {{$paginate}} +</div> diff --git a/view/tpl/webpagelist.tpl b/view/tpl/webpagelist.tpl index 4ae153423..8335ebd62 100644 --- a/view/tpl/webpagelist.tpl +++ b/view/tpl/webpagelist.tpl @@ -1,6 +1,7 @@ +{{$listtitle}} {{if $pages}} - <div id="pagelist-content-wrapper" class="generic-content-wrapper"> + <div id="pagelist-content-wrapper" class="generic-content-wrapper-styled"> <table class="webpage-list-table"> <tr><td>{{$actions_txt}}</td><td>{{$pagelink_txt}}</td><td>{{$title_txt}}</td><td>{{$created_txt}}</td><td>{{$edited_txt}}</td></tr> {{foreach $pages as $key => $items}} @@ -9,7 +10,7 @@ <td> {{if $edit}}<a href="{{$baseurl}}/{{$item.url}}" title="{{$edit}}"><i class="icon-pencil design-icons design-edit-icon btn btn-default"></i></a> {{/if}} {{if $view}}<a href="page/{{$channel}}/{{$item.pagetitle}}" title="{{$view}}"><i class="icon-external-link design-icons design-view-icon btn btn-default"></i></a> {{/if}} - {{if $preview}}<a href="page/{{$channel}}/{{$item.pagetitle}}?iframe=true&width=80%&height=80%" title="{{$preview}}" class="webpage-preview" ><i class="icon-eye-open design-icons design-preview-icon btn btn-default"></i></a> {{/if}} + {{if $preview}}<a href="page/{{$channel}}/{{$item.pagetitle}}" title="{{$preview}}" class="webpage-preview" ><i class="icon-eye-open design-icons design-preview-icon btn btn-default"></i></a> {{/if}} </td> <td> {{if $view}}<a href="page/{{$channel}}/{{$item.pagetitle}}" title="{{$view}}">{{$item.pagetitle}}</a> |