diff options
Diffstat (limited to 'view')
| -rw-r--r-- | view/css/widgets.css | 3 | ||||
| l--------- | view/de | 1 | ||||
| -rw-r--r-- | view/de-de/hmessages.po (renamed from view/de/hmessages.po) | 0 | ||||
| -rw-r--r-- | view/de-de/hstrings.php (renamed from view/de/hstrings.php) | 0 | ||||
| -rw-r--r-- | view/de-de/htconfig.tpl (renamed from view/de/htconfig.tpl) | 0 | ||||
| -rw-r--r-- | view/de-de/lostpass_eml.tpl (renamed from view/de/lostpass_eml.tpl) | 0 | ||||
| -rw-r--r-- | view/de-de/messages.po (renamed from view/de/messages.po) | 0 | ||||
| -rw-r--r-- | view/de-de/passchanged_eml.tpl (renamed from view/de/passchanged_eml.tpl) | 0 | ||||
| -rw-r--r-- | view/de-de/register_open_eml.tpl (renamed from view/de/register_open_eml.tpl) | 0 | ||||
| -rw-r--r-- | view/de-de/register_verify_eml.tpl (renamed from view/de/register_verify_eml.tpl) | 0 | ||||
| -rw-r--r-- | view/de-de/strings.php (renamed from view/de/strings.php) | 0 | ||||
| -rw-r--r-- | view/de-de/update_fail_eml.tpl (renamed from view/de/update_fail_eml.tpl) | 0 | ||||
| -rw-r--r-- | view/js/acl.js | 6 | ||||
| -rw-r--r-- | view/js/main.js | 9 | ||||
| -rwxr-xr-x | view/tpl/admin_site.tpl | 3 | ||||
| -rwxr-xr-x | view/tpl/hq.tpl | 7 | ||||
| -rwxr-xr-x | view/tpl/myapps.tpl | 4 | ||||
| -rw-r--r-- | view/tpl/notifications_widget.tpl | 5 |
18 files changed, 29 insertions, 9 deletions
diff --git a/view/css/widgets.css b/view/css/widgets.css index 5b1273e25..76e829b04 100644 --- a/view/css/widgets.css +++ b/view/css/widgets.css @@ -170,6 +170,9 @@ a.wikilist { } /* notifications */ +.notifications-btn { + opacity: .5; +} .notification-content { max-height: 70vh; diff --git a/view/de b/view/de new file mode 120000 index 000000000..47f12ca72 --- /dev/null +++ b/view/de @@ -0,0 +1 @@ +de-de
\ No newline at end of file diff --git a/view/de/hmessages.po b/view/de-de/hmessages.po index e7c962bbd..e7c962bbd 100644 --- a/view/de/hmessages.po +++ b/view/de-de/hmessages.po diff --git a/view/de/hstrings.php b/view/de-de/hstrings.php index 61db3fb5d..61db3fb5d 100644 --- a/view/de/hstrings.php +++ b/view/de-de/hstrings.php diff --git a/view/de/htconfig.tpl b/view/de-de/htconfig.tpl index 46bf0de14..46bf0de14 100644 --- a/view/de/htconfig.tpl +++ b/view/de-de/htconfig.tpl diff --git a/view/de/lostpass_eml.tpl b/view/de-de/lostpass_eml.tpl index 02a71b77a..02a71b77a 100644 --- a/view/de/lostpass_eml.tpl +++ b/view/de-de/lostpass_eml.tpl diff --git a/view/de/messages.po b/view/de-de/messages.po index 460fd764b..460fd764b 100644 --- a/view/de/messages.po +++ b/view/de-de/messages.po diff --git a/view/de/passchanged_eml.tpl b/view/de-de/passchanged_eml.tpl index 95805f677..95805f677 100644 --- a/view/de/passchanged_eml.tpl +++ b/view/de-de/passchanged_eml.tpl diff --git a/view/de/register_open_eml.tpl b/view/de-de/register_open_eml.tpl index ce96d2ec6..ce96d2ec6 100644 --- a/view/de/register_open_eml.tpl +++ b/view/de-de/register_open_eml.tpl diff --git a/view/de/register_verify_eml.tpl b/view/de-de/register_verify_eml.tpl index 4da21265d..4da21265d 100644 --- a/view/de/register_verify_eml.tpl +++ b/view/de-de/register_verify_eml.tpl diff --git a/view/de/strings.php b/view/de-de/strings.php index 85bff2451..85bff2451 100644 --- a/view/de/strings.php +++ b/view/de-de/strings.php diff --git a/view/de/update_fail_eml.tpl b/view/de-de/update_fail_eml.tpl index d28bed717..d28bed717 100644 --- a/view/de/update_fail_eml.tpl +++ b/view/de-de/update_fail_eml.tpl diff --git a/view/js/acl.js b/view/js/acl.js index 6042b43ca..c8f7c7180 100644 --- a/view/js/acl.js +++ b/view/js/acl.js @@ -173,11 +173,7 @@ ACL.prototype.on_custom = function(event) { that.deny_cid = []; that.deny_gid = []; - $("#acl-list-content .acl-list-item img[data-src]").each(function(i, el) { - //Replace data-src attribute with src attribute for every image - $(el).attr('src', $(el).data("src")); - $(el).removeAttr("data-src"); - }); + datasrc2src('#acl-list-content .acl-list-item img[data-src]'); that.update_view('custom'); that.on_submit(); diff --git a/view/js/main.js b/view/js/main.js index 11a09b647..77b8e91e7 100644 --- a/view/js/main.js +++ b/view/js/main.js @@ -92,6 +92,13 @@ $(document).ready(function() { }); +function datasrc2src(selector) { + $(selector).each(function(i, el) { + $(el).attr("src", $(el).data("src")); + $(el).removeAttr("data-src"); + }); +} + function confirmDelete() { return confirm(aStr.delitem); } @@ -373,10 +380,12 @@ function notificationsUpdate() { if(data.network || data.home || data.intros || data.register || data.mail || data.all_events || data.notify || data.files || data.pubs) { $('.notifications-btn').css('opacity', 1); + $('#no_notifications').hide(); } else { $('.notifications-btn').css('opacity', 0.5); $('#navbar-collapse-1').removeClass('show'); + $('#no_notifications').show(); } if(data.home || data.intros || data.register || data.mail || data.notify || data.files) { diff --git a/view/tpl/admin_site.tpl b/view/tpl/admin_site.tpl index a2a9f3f27..2b4e8c9f9 100755 --- a/view/tpl/admin_site.tpl +++ b/view/tpl/admin_site.tpl @@ -71,6 +71,9 @@ {{include file="field_select.tpl" field=$register_policy}} {{include file="field_checkbox.tpl" field=$invite_only}} {{include file="field_select.tpl" field=$access_policy}} + {{include file="field_input.tpl" field=$location}} + {{include file="field_input.tpl" field=$sellpage}} + <div class="submit"><input type="submit" name="page_site" value="{{$submit}}" /></div> <h3>{{$corporate}}</h3> diff --git a/view/tpl/hq.tpl b/view/tpl/hq.tpl index bd27250e6..fce11ff83 100755 --- a/view/tpl/hq.tpl +++ b/view/tpl/hq.tpl @@ -1,9 +1,14 @@ {{if $no_messages}} <div class="alert alert-warning alert-dismissible fade show" role="alert"> - {{$no_messages_label}} <button type="button" class="close" data-dismiss="alert" aria-label="Close"> <span aria-hidden="true">×</span> </button> + <h3>{{$no_messages_label.0}}</h3> + <br> + {{$no_messages_label.1}} </div> {{/if}} +<div id="jot-popup"> +{{$editor}} +</div> diff --git a/view/tpl/myapps.tpl b/view/tpl/myapps.tpl index dd2a67a63..0ac836b38 100755 --- a/view/tpl/myapps.tpl +++ b/view/tpl/myapps.tpl @@ -4,10 +4,10 @@ {{if $create}} <a href="appman" class="pull-right btn btn-success btn-sm"><i class="fa fa-pencil-square-o"></i> {{$create}}</a> {{else}} - <a href="apps/edit{{if $cat}}/?f=&cat={{$cat}}{{/if}}" class="pull-right btn btn-primary btn-sm">{{$manage}}</a> + <a href="apps/edit{{if $cat.0}}/?f=&cat={{$cat.0}}{{/if}}" class="pull-right btn btn-primary btn-sm">{{$manage}}</a> {{/if}} {{/if}} - <h2>{{$title}}{{if $cat}} - {{$cat}}{{/if}}</h2> + <h2>{{$title}}{{if $cat.0}} - {{$cat.0}}{{/if}}</h2> </div> <div class="clearfix section-content-wrapper"> {{foreach $apps as $ap}} diff --git a/view/tpl/notifications_widget.tpl b/view/tpl/notifications_widget.tpl index 299c07592..9d2e08c41 100644 --- a/view/tpl/notifications_widget.tpl +++ b/view/tpl/notifications_widget.tpl @@ -63,7 +63,7 @@ $(document).on('click', '#tt-{{$notification.type}}-only', function(e) { e.preventDefault(); $('#nav-{{$notification.type}}-menu [data-thread_top=false]').toggle(); - $(this).toggleClass('active'); + $(this).toggleClass('active sticky-top'); }); {{/if}} {{/foreach}} @@ -85,6 +85,9 @@ {{if $notifications}} <div id="notifications_wrapper"> + <div id="no_notifications" class="d-xl-none"> + {{$no_notifications}}<span class="jumping-dots"><span class="dot-1">.</span><span class="dot-2">.</span><span class="dot-3">.</span></span> + </div> <div id="notifications" class="navbar-nav" data-children=".nav-item"> <div id="nav-notifications-template" rel="template"> <a class="list-group-item clearfix notification {5}" href="{0}" title="{2} {3}" data-b64mid="{6}" data-notify_id="{7}" data-thread_top="{8}"> |