From 68bdd26426269ff641ef97bdecb3d2cff38fb6b5 Mon Sep 17 00:00:00 2001 From: Mario Vavti Date: Tue, 13 Dec 2016 10:09:26 +0100 Subject: simplify wikilist widget --- view/tpl/wikilist_widget.tpl | 39 +-------------------------------------- 1 file changed, 1 insertion(+), 38 deletions(-) (limited to 'view/tpl') diff --git a/view/tpl/wikilist_widget.tpl b/view/tpl/wikilist_widget.tpl index 51eccad90..1f92b5807 100644 --- a/view/tpl/wikilist_widget.tpl +++ b/view/tpl/wikilist_widget.tpl @@ -1,45 +1,8 @@

{{$header}}

- {{if $owner}} - - {{/if}}
-{{$acl}} -- cgit v1.2.3 From 0979f11cc32e581ed42f8b42302605a31887be67 Mon Sep 17 00:00:00 2001 From: Mario Vavti Date: Tue, 13 Dec 2016 10:23:56 +0100 Subject: do not increase opacity to more than 1 --- view/tpl/cover_photo_widget.tpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'view/tpl') diff --git a/view/tpl/cover_photo_widget.tpl b/view/tpl/cover_photo_widget.tpl index 2b47270c9..bc1f421bd 100755 --- a/view/tpl/cover_photo_widget.tpl +++ b/view/tpl/cover_photo_widget.tpl @@ -53,7 +53,7 @@ } } } - if($('#cover-photo').length) { + if($('#cover-photo').length && $('main').css('opacity') < 1) { $('main').css('opacity', ($(window).scrollTop()/$('#cover-photo').height()).toFixed(1)); } }); -- cgit v1.2.3 From 0927af40c36083f95c5833971e07646f63d073cc Mon Sep 17 00:00:00 2001 From: Mario Vavti Date: Tue, 13 Dec 2016 11:14:22 +0100 Subject: bring lockview to wikilist --- view/tpl/wikilist.tpl | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) (limited to 'view/tpl') diff --git a/view/tpl/wikilist.tpl b/view/tpl/wikilist.tpl index 1fb7dbec1..eeaf7cd7e 100644 --- a/view/tpl/wikilist.tpl +++ b/view/tpl/wikilist.tpl @@ -27,9 +27,10 @@
- + + {{if $owner}} {{/if}} @@ -38,6 +39,12 @@ + {{if $owner}} -- cgit v1.2.3 From b24b3d21e1d4999e03d4e268261bd190c6d02441 Mon Sep 17 00:00:00 2001 From: Mario Vavti Date: Tue, 13 Dec 2016 11:24:03 +0100 Subject: dropdown position fixes --- view/tpl/photo_view.tpl | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'view/tpl') diff --git a/view/tpl/photo_view.tpl b/view/tpl/photo_view.tpl index db5ffe3f5..967abea71 100755 --- a/view/tpl/photo_view.tpl +++ b/view/tpl/photo_view.tpl @@ -7,7 +7,7 @@ -
    +
      {{if $tools}}
    •  {{$tools.profile.1}} @@ -32,7 +32,7 @@ {{if $lock}}
      - +
      {{/if}} {{if $prevlink || $nextlink}} -- cgit v1.2.3 From f111c5c325fec1139ee7ea36c691de452469fa5a Mon Sep 17 00:00:00 2001 From: zotlabs Date: Tue, 13 Dec 2016 17:30:02 -0800 Subject: mail preview (basic functionality) --- view/tpl/prv_message.tpl | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) (limited to 'view/tpl') diff --git a/view/tpl/prv_message.tpl b/view/tpl/prv_message.tpl index 0c9b9ba1d..67588f717 100755 --- a/view/tpl/prv_message.tpl +++ b/view/tpl/prv_message.tpl @@ -10,6 +10,7 @@ + {{if $new}}
      @@ -35,9 +36,16 @@
      -
      +
      + +
      + +
      + + +
      +
      {{if $new}} -- cgit v1.2.3 From 62353191e8759263d6279822d369ac1ae22f0a5f Mon Sep 17 00:00:00 2001 From: Mario Vavti Date: Wed, 14 Dec 2016 09:57:22 +0100 Subject: fix btn-group rendering --- view/tpl/prv_message.tpl | 18 ++---------------- 1 file changed, 2 insertions(+), 16 deletions(-) (limited to 'view/tpl') diff --git a/view/tpl/prv_message.tpl b/view/tpl/prv_message.tpl index 67588f717..e4e923ddb 100755 --- a/view/tpl/prv_message.tpl +++ b/view/tpl/prv_message.tpl @@ -7,11 +7,9 @@ {{/if}}
      - - {{if $new}}
      @@ -23,29 +21,20 @@
      {{/if}} - {{if $reply}} {{/if}} -
      -
      -
      - -
      - -
      +
      +
      - - -
      {{/if}} -
    - -
    -- cgit v1.2.3 From 028935a318e5848542faa551f3d39bbe8b365447 Mon Sep 17 00:00:00 2001 From: Mario Vavti Date: Wed, 14 Dec 2016 11:55:52 +0100 Subject: wiki: do not show revert buttons if we do not have write perms and minor cleanup --- view/tpl/generic_modal.tpl | 4 +++- view/tpl/wiki.tpl | 7 +------ view/tpl/wiki_page_history.tpl | 3 +++ 3 files changed, 7 insertions(+), 7 deletions(-) (limited to 'view/tpl') diff --git a/view/tpl/generic_modal.tpl b/view/tpl/generic_modal.tpl index 3f7326e71..2bbea42b3 100644 --- a/view/tpl/generic_modal.tpl +++ b/view/tpl/generic_modal.tpl @@ -8,8 +8,10 @@
    + {{if $ok}} + {{/if}}
    - \ No newline at end of file + diff --git a/view/tpl/wiki.tpl b/view/tpl/wiki.tpl index a84209b37..4638e4758 100644 --- a/view/tpl/wiki.tpl +++ b/view/tpl/wiki.tpl @@ -41,7 +41,7 @@ -
    +
{{$name}}{{$name}} {{$type}}
{{$wiki.title}} {{$wiki.mimeType}} + {{if $wiki.lock}} + + + {{/if}} +
+ {{foreach $pageHistory as $commit}} + + {{/foreach}} +
+ + + + + +
Date{{$commit.date}} + {{if $permsWrite}} + +

+ {{/if}} + +
{{$name_lbl}}{{$commit.name}}
{{$msg_label}}{{$commit.title}}
+
diff --git a/view/tpl/wiki_page_list.tpl b/view/tpl/wiki_page_list.tpl index ef2b41490..a270e6cee 100644 --- a/view/tpl/wiki_page_list.tpl +++ b/view/tpl/wiki_page_list.tpl @@ -19,6 +19,7 @@ {{if $canadd}} -
{{if $nav.help.6}}
-- cgit v1.2.3 From 3f66d9f8cddd4465a430e9bf70a37447de04e821 Mon Sep 17 00:00:00 2001 From: Mario Vavti Date: Thu, 2 Feb 2017 10:54:44 +0100 Subject: do not use data-toggle on the badge and use fixed with for icons --- view/tpl/nav.tpl | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) (limited to 'view/tpl') diff --git a/view/tpl/nav.tpl b/view/tpl/nav.tpl index 5a2dda730..5fc7e66a7 100755 --- a/view/tpl/nav.tpl +++ b/view/tpl/nav.tpl @@ -61,7 +61,7 @@ {{if $nav.network}}
+ {{if $nav.help.6}}
{{$nav.help.5}} diff --git a/view/tpl/navapps.tpl b/view/tpl/navapps.tpl index a90fdbaf2..db5c7ae17 100644 --- a/view/tpl/navapps.tpl +++ b/view/tpl/navapps.tpl @@ -1,9 +1,9 @@ - + -- cgit v1.2.3 From 028b2a655de8c9d7b1f0de05a869e59c2b219818 Mon Sep 17 00:00:00 2001 From: Mario Vavti Date: Thu, 2 Feb 2017 20:39:06 +0100 Subject: whitespace cleanup --- view/tpl/nav.tpl | 333 +++++++++++++++++++++++++++---------------------------- 1 file changed, 161 insertions(+), 172 deletions(-) (limited to 'view/tpl') diff --git a/view/tpl/nav.tpl b/view/tpl/nav.tpl index b42b615df..a443f4730 100755 --- a/view/tpl/nav.tpl +++ b/view/tpl/nav.tpl @@ -1,197 +1,185 @@ -
-
- - {{if $localuser}} - - {{/if}} - - - {{if $nav.help.6}} - - {{/if}} - - {{if $userinfo}} -
- {{$userinfo.name}} - -
- {{if $localuser}} - - {{else}} - {{if $nav.rusermenu}} - - {{/if}} - {{/if}} - {{/if}} +
+
+ + {{if $localuser}} + + {{/if}} + + + {{if $nav.help.6}} + + {{/if}} + {{if $userinfo}} +
+ {{$userinfo.name}} +
- - + + {{/if}} - {{if $nav.register}} - + {{/if}} - {{if $nav.alogout}} - + {{/if}} - - -
    - - +
+
    + {{if $nav.help.6}} - + {{/if}} - - -
- -
+ +
{{/if}} +
-- cgit v1.2.3 From 2daafe80a5cc9af9fb40712135490c86155fb9cf Mon Sep 17 00:00:00 2001 From: zotlabs Date: Thu, 2 Feb 2017 14:49:51 -0800 Subject: move opensearch to plugins --- view/tpl/head.tpl | 4 ++-- view/tpl/opensearch.tpl | 13 ------------- 2 files changed, 2 insertions(+), 15 deletions(-) delete mode 100755 view/tpl/opensearch.tpl (limited to 'view/tpl') diff --git a/view/tpl/head.tpl b/view/tpl/head.tpl index 7e7155fec..a300a702f 100755 --- a/view/tpl/head.tpl +++ b/view/tpl/head.tpl @@ -5,8 +5,8 @@ {{$head_css}} {{$js_strings}} {{$head_js}} - - +{{$linkrel}} +{{$plugins}}