aboutsummaryrefslogtreecommitdiffstats
path: root/view/tpl
diff options
context:
space:
mode:
authorzotlabs <mike@macgirvin.com>2017-10-08 12:42:54 -0700
committerzotlabs <mike@macgirvin.com>2017-10-08 12:42:54 -0700
commit5cc6c6c1e97743b208b90f2a05b23196df787f36 (patch)
tree77b85421af0e0052f5b0ab23fc95abd51bc89728 /view/tpl
parentd2e22d8c2f5ee7c0bca1fa63d39a6822582106e8 (diff)
parent991db280be4c3cbbff4fb1e4dae8f303a487ed3f (diff)
downloadvolse-hubzilla-5cc6c6c1e97743b208b90f2a05b23196df787f36.tar.gz
volse-hubzilla-5cc6c6c1e97743b208b90f2a05b23196df787f36.tar.bz2
volse-hubzilla-5cc6c6c1e97743b208b90f2a05b23196df787f36.zip
Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge
Diffstat (limited to 'view/tpl')
-rw-r--r--view/tpl/cloud_directory.tpl2
-rwxr-xr-xview/tpl/main_slider.tpl4
-rwxr-xr-xview/tpl/nav.tpl39
-rwxr-xr-xview/tpl/new_channel.tpl4
-rw-r--r--view/tpl/notifications_widget.tpl57
-rw-r--r--view/tpl/profile_tabs.tpl4
-rwxr-xr-xview/tpl/register.tpl4
7 files changed, 100 insertions, 14 deletions
diff --git a/view/tpl/cloud_directory.tpl b/view/tpl/cloud_directory.tpl
index adc8584c3..e8ae6a590 100644
--- a/view/tpl/cloud_directory.tpl
+++ b/view/tpl/cloud_directory.tpl
@@ -25,7 +25,7 @@
<td><a href="{{$item.fullPath}}">{{$item.displayName}}</a></td>
{{if $item.is_owner}}
<td class="cloud-index-tool">{{$item.attachIcon}}</td>
- <td id="file-edit-{{$item.attachId}}" class="cloud-index-tool"></td>
+ <td class="cloud-index-tool"><div id="file-edit-{{$item.attachId}}" class="spinner-wrapper"><div class="spinner s"></div></div></td>
<td class="cloud-index-tool"><i class="fakelink fa fa-pencil" onclick="filestorage(event, '{{$nick}}', {{$item.attachId}});"></i></td>
<td class="cloud-index-tool"><a href="#" title="{{$delete}}" onclick="dropItem('{{$item.fileStorageUrl}}/{{$item.attachId}}/delete', '#cloud-index-{{$item.attachId}},#cloud-tools-{{$item.attachId}}'); return false;"><i class="fa fa-trash-o drop-icons"></i></a></td>
diff --git a/view/tpl/main_slider.tpl b/view/tpl/main_slider.tpl
index d4f0dd936..4cc265f59 100755
--- a/view/tpl/main_slider.tpl
+++ b/view/tpl/main_slider.tpl
@@ -1,5 +1,5 @@
<div id="main-slider" class="slider" ><input id="main-range" type="text" name="cminmax" value="{{$val}}" /></div>
-<div id="profile-jot-text-loading" style="display:none;"></div>
+<div id="profile-jot-text-loading" class="spinner-wrapper"><div class="spinner m"></div></div>
<script>
$(document).ready(function() {
var old_cmin = 0;
@@ -27,7 +27,7 @@ $(document).ready(function() {
return;
if((bParam_cmin == old_cmin) && (bParam_cmax == old_cmax))
return;
- setTimeout(function() { $("#profile-jot-text-loading").spin('small'); }, 1000 );
+
slideTimer = setTimeout(networkTimerRefresh,2000);
}
diff --git a/view/tpl/nav.tpl b/view/tpl/nav.tpl
index 82cdc0dd0..92ab88574 100755
--- a/view/tpl/nav.tpl
+++ b/view/tpl/nav.tpl
@@ -63,16 +63,25 @@
<button id="expand-aside" type="button" class="navbar-toggler border-0" data-toggle="offcanvas" data-target="#region_1">
<i class="fa fa-arrow-circle-right" id="expand-aside-icon"></i>
</button>
+ {{if ! $experimental_notif}}
{{if $localuser || $nav.pubs}}
<button id="notifications-btn" type="button" class="navbar-toggler border-0 text-white" data-toggle="collapse" data-target="#navbar-collapse-1">
<i class="fa fa-exclamation-circle"></i>
</button>
{{/if}}
+ {{else}}
+ {{if $localuser || $nav.pubs}}
+ <button id="notifications-btn-1" type="button" class="navbar-toggler border-0 text-white">
+ <i class="fa fa-exclamation-circle"></i>
+ </button>
+ {{/if}}
+ {{/if}}
<button id="menu-btn" class="navbar-toggler border-0" type="button" data-toggle="collapse" data-target="#navbar-collapse-2">
<i class="fa fa-bars"></i>
</button>
</div>
<div class="collapse navbar-collapse" id="navbar-collapse-1">
+ {{if ! $experimental_notif}}
<ul class="navbar-nav mr-auto">
{{if $nav.network}}
<li class="nav-item dropdown network-button" style="display: none;">
@@ -188,17 +197,25 @@
<a class="nav-link" href="{{$nav.alogout.0}}" title="{{$nav.alogout.3}}" id="{{$nav.alogout.4}}">{{$nav.alogout.1}}</a>
</li>
{{/if}}
-
{{if $nav.pubs}}
<li class="nav-item dropdown pubs-button" style="display: none;">
- <a class="nav-link" href="{{$nav.pubs.0}}" title="{{$nav.pubs.3}}" id="{{$nav.pubs.4}}" rel="#nav-pubs-menu">
+ <a class="nav-link" href="#" title="{{$nav.pubs.3}}" id="{{$nav.pubs.4}}" data-toggle="dropdown" rel="#nav-pubs-menu">
<i class="fa fa-fw fa-globe"></i>
- <span class="badge badge-pill badge-primary pubs-update"></span>
+ <span class="badge badge-pill badge-secondary pubs-update"></span>
</a>
+ <div id="nav-pubs-menu" class="dropdown-menu" rel="pubs">
+ <a class="dropdown-item" id="nav-pubs-see-all" href="{{$nav.pubs.all.0}}">{{$nav.pubs.all.1}}</a>
+ <a class="dropdown-item" id="nav-pubs-mark-all" href="#" onclick="markRead('pubs'); return false;">{{$nav.pubs.mark.1}}</a>
+ {{$emptynotifications}}
+ </div>
</li>
{{/if}}
</ul>
-
+ {{else}}
+ <div class="navbar-nav mr-auto">
+ <div class="text-white">{{$sel.active}}</div>
+ </div>
+ {{/if}}
<div id="banner" class="navbar-text d-none d-md-flex">{{$banner}}</div>
<ul id="nav-right" class="navbar-nav ml-auto d-none d-md-flex">
@@ -218,10 +235,20 @@
<a class="nav-link {{$nav.help.2}}" target="hubzilla-help" href="{{$nav.help.0}}" title="{{$nav.help.3}}" id="{{$nav.help.4}}" onclick="contextualHelp(); return false;"><i class="fa fa-fw fa-question-circle"></i></a>
</li>
{{/if}}
+ {{if $channel_menu && $channel_apps.0}}
+ <li class="nav-item dropdown" id="channel-menu">
+ <a class="nav-link" href="#" data-toggle="dropdown"><img src="{{$channel_thumb}}" style="height:14px; width:14px;position:relative; top:-2px;" /></a>
+ <div id="dropdown-menu" class="dropdown-menu dropdown-menu-right">
+ {{foreach $channel_apps as $channel_app}}
+ {{$channel_app}}
+ {{/foreach}}
+ </div>
+ </li>
+ {{/if}}
<li class="nav-item dropdown" id="app-menu">
<a class="nav-link" href="#" data-toggle="dropdown"><i class="fa fa-fw fa-bars"></i></a>
<div id="dropdown-menu" class="dropdown-menu dropdown-menu-right">
- {{if $channel_apps.0}}
+ {{if $channel_apps.0 && ! $channel_menu}}
{{foreach $channel_apps as $channel_app}}
{{$channel_app}}
{{/foreach}}
@@ -233,7 +260,7 @@
{{foreach $nav_apps as $nav_app}}
{{$nav_app}}
{{/foreach}}
- {{if $channel_apps.0}}
+ {{if $channel_apps.0 && ! $channel_menu}}
</div>
{{/if}}
{{if $is_owner}}
diff --git a/view/tpl/new_channel.tpl b/view/tpl/new_channel.tpl
index cc1983ac4..c4837064f 100755
--- a/view/tpl/new_channel.tpl
+++ b/view/tpl/new_channel.tpl
@@ -19,10 +19,10 @@
{{/if}}
{{include file="field_input.tpl" field=$name}}
- <div id="name-spinner"></div>
+ <div id="name-spinner" class="spinner-wrapper"><div class="spinner m"></div></div>
{{include file="field_input.tpl" field=$nickname}}
- <div id="nick-spinner"></div>
+ <div id="nick-spinner" class="spinner-wrapper"><div class="spinner m"></div></div>
<button class="btn btn-primary" type="submit" name="submit" id="newchannel-submit-button" value="{{$submit}}">{{$submit}}</button>
<div id="newchannel-submit-end" class="clear"></div>
diff --git a/view/tpl/notifications_widget.tpl b/view/tpl/notifications_widget.tpl
new file mode 100644
index 000000000..07423563a
--- /dev/null
+++ b/view/tpl/notifications_widget.tpl
@@ -0,0 +1,57 @@
+<style>
+ #notifications {
+ width: 100%;
+ }
+
+ .notification-content {
+ max-height: 50vh;
+ overflow: auto;
+ border-left: 0.2rem solid #eee;
+ }
+
+ .fs {
+ position: fixed;
+ top: 0px;
+ left: 0px;
+ display: block !important;
+ background-color: white;
+ width: 100%;
+ max-width: 100%;
+ height: 100vh;
+ z-index: 1020;
+ }
+
+ .fs #notifications {
+ position: relative !important;
+ width: 100% !important;
+ top: 0px !important;
+ }
+</style>
+
+<div id="nav-notifications-template" rel="template">
+ <a class="dropdown-item clearfix dropdown-notification {5}" href="{0}" title="{2} {3}">
+ <img class="menu-img-3" data-src="{1}">
+ <span class="contactname">{2}</span>
+ <span class="dropdown-sub-text">{3}<br>{4}</span>
+ </a>
+</div>
+
+<ul id="notifications" class="navbar-nav" style="position: fixed; width: 280px; top: 64px;" data-children=".nav-item">
+ {{foreach $notifications as $notification}}
+ <li class="nav-item {{$notification.type}}-button" style="display: none;">
+ <a class="nav-link" href="#nav-{{$notification.type}}-menu" title="{{$notification.title}}" data-toggle="collapse" data-parent="#notifications" rel="#nav-{{$notification.type}}-menu">
+ <i class="fa fa-fw fa-{{$notification.icon}}"></i> {{$notification.label}}
+ <span class="float-right badge badge-{{$notification.severity}} {{$notification.type}}-update"></span>
+ </a>
+ <div id="nav-{{$notification.type}}-menu" class="collapse notification-content" rel="{{$notification.type}}">
+ {{if $notification.viewall}}
+ <a class="dropdown-item" id="nav-{{$notification.type}}-see-all" href="{{$notification.viewall.url}}">{{$notification.viewall.label}}</a>
+ {{/if}}
+ {{if $notification.markall}}
+ <a class="dropdown-item" id="nav-{{$notification.type}}-mark-all" href="{{$notification.markall.url}}" onclick="markRead('{{$notification.type}}'); return false;">{{$notification.markall.label}}</a>
+ {{/if}}
+ {{$loading}}
+ </div>
+ </li>
+ {{/foreach}}
+</ul>
diff --git a/view/tpl/profile_tabs.tpl b/view/tpl/profile_tabs.tpl
index 49b74bb8f..b59135209 100644
--- a/view/tpl/profile_tabs.tpl
+++ b/view/tpl/profile_tabs.tpl
@@ -1,5 +1,7 @@
-<div class="dropdown-header"><img src="{{$thumb}}" class="menu-img-1">{{$name}}:</div>
+<div class="dropdown-header"><img src="{{$thumb}}" class="menu-img-1">{{$name}}</div>
{{foreach $tabs as $tab}}
<a class="dropdown-item{{if $tab.sel}} {{$tab.sel}}{{/if}}" href="{{$tab.url}}"{{if $tab.title}} title="{{$tab.title}}"{{/if}}><i class="fa fa-fw fa-{{$tab.icon}} generic-icons-nav"></i>{{$tab.label}}</a>
{{/foreach}}
+{{if ! $channel_menu}}
<div class="dropdown-divider"></div>
+{{/if}} \ No newline at end of file
diff --git a/view/tpl/register.tpl b/view/tpl/register.tpl
index c84934626..493dba4c8 100755
--- a/view/tpl/register.tpl
+++ b/view/tpl/register.tpl
@@ -39,10 +39,10 @@
{{/if}}
{{include file="field_input.tpl" field=$name}}
- <div id="name-spinner"></div>
+ <div id="name-spinner" class="spinner-wrapper"><div class="spinner m"></div></div>
{{include file="field_input.tpl" field=$nickname}}
- <div id="nick-spinner"></div>
+ <div id="nick-spinner" class="spinner-wrapper"><div class="spinner m"></div></div>
{{/if}}
{{if $enable_tos}}