From 1d8cac6e73cea1cfbed76a7694150cff12582b4f Mon Sep 17 00:00:00 2001 From: Haakon Meland Eriksen Date: Wed, 11 Nov 2015 23:31:18 +0100 Subject: [PATCH 001/159] Rearranged comment buttons --- view/tpl/comment_item.tpl | 23 +++++++++++++---------- 1 file changed, 13 insertions(+), 10 deletions(-) mode change 100755 => 100644 view/tpl/comment_item.tpl diff --git a/view/tpl/comment_item.tpl b/view/tpl/comment_item.tpl old mode 100755 new mode 100644 index 49c6af764..9c8de8301 --- a/view/tpl/comment_item.tpl +++ b/view/tpl/comment_item.tpl @@ -22,7 +22,20 @@
+ {{if $feature_encrypt}} +
+ +
+ {{/if}} +
+ + @@ -40,9 +53,6 @@
- @@ -50,13 +60,6 @@
- {{if $feature_encrypt}} -
- -
- {{/if}}
{{if $preview}} From 85e5cd7f98b05f5a5722d2abe0485454184a54f9 Mon Sep 17 00:00:00 2001 From: Haakon Meland Eriksen Date: Wed, 11 Nov 2015 23:43:41 +0100 Subject: [PATCH 002/159] Rearranged comment buttons back --- view/tpl/comment_item.tpl | 23 ++++++++++------------- 1 file changed, 10 insertions(+), 13 deletions(-) mode change 100644 => 100755 view/tpl/comment_item.tpl diff --git a/view/tpl/comment_item.tpl b/view/tpl/comment_item.tpl old mode 100644 new mode 100755 index 9c8de8301..49c6af764 --- a/view/tpl/comment_item.tpl +++ b/view/tpl/comment_item.tpl @@ -22,20 +22,7 @@
- {{if $feature_encrypt}} -
- -
- {{/if}} -
- - @@ -53,6 +40,9 @@
+ @@ -60,6 +50,13 @@
+ {{if $feature_encrypt}} +
+ +
+ {{/if}}
{{if $preview}} From e26b558e531a08321369fc5a2ec4646e9a2d410c Mon Sep 17 00:00:00 2001 From: Haakon Meland Eriksen Date: Wed, 11 Nov 2015 23:55:05 +0100 Subject: [PATCH 003/159] Promoted upload of images and encryption --- view/tpl/jot.tpl | 10 ++++++++++ 1 file changed, 10 insertions(+) mode change 100755 => 100644 view/tpl/jot.tpl diff --git a/view/tpl/jot.tpl b/view/tpl/jot.tpl old mode 100755 new mode 100644 index 75f6b0027..15b45568a --- a/view/tpl/jot.tpl +++ b/view/tpl/jot.tpl @@ -48,6 +48,16 @@
+ {{if $writefiles}} + + {{/if}} + {{if $feature_encrypt}} + + {{/if}} From 90463ee67de2937dddfd6a28cc0514feab47c27c Mon Sep 17 00:00:00 2001 From: Haakon Meland Eriksen Date: Thu, 12 Nov 2015 07:45:37 +0100 Subject: [PATCH 004/159] Make upload and encrypt easier on phones by editing jot.tpl --- view/tpl/jot.tpl | 24 +++++++++++------------- 1 file changed, 11 insertions(+), 13 deletions(-) diff --git a/view/tpl/jot.tpl b/view/tpl/jot.tpl index 15b45568a..859a1c0b6 100644 --- a/view/tpl/jot.tpl +++ b/view/tpl/jot.tpl @@ -49,15 +49,17 @@
{{if $writefiles}} - - {{/if}} - {{if $feature_encrypt}} - - {{/if}} + + {{/if}} + {{if $feature_encrypt}} + + {{/if}} +
+
@@ -126,7 +128,6 @@
  •  {{$preview}}
  • {{if $visitor}}
  • - {{if $writefiles}}
  •  {{$attach}}
  • {{/if}}
  •  {{$weblink}}
  • @@ -139,9 +140,6 @@ {{if $feature_expire}}
  •  {{$expires}}
  • {{/if}} - {{if $feature_encrypt}} -
  •  {{$encrypt}}
  • - {{/if}} {{if $feature_voting}}
  •  {{$voting}}
  • {{/if}} From d786502f199c22d2d4c1b457cd535209d932886d Mon Sep 17 00:00:00 2001 From: Haakon Meland Eriksen Date: Thu, 12 Nov 2015 20:44:41 +0100 Subject: [PATCH 005/159] Regrouped post buttons --- view/tpl/jot.tpl | 62 +++++++++++++++++++++++------------------------- 1 file changed, 30 insertions(+), 32 deletions(-) diff --git a/view/tpl/jot.tpl b/view/tpl/jot.tpl index 859a1c0b6..e19eda5c9 100644 --- a/view/tpl/jot.tpl +++ b/view/tpl/jot.tpl @@ -53,13 +53,22 @@ {{/if}} - {{if $feature_encrypt}} - - {{/if}} + {{if $feature_voting}} + + {{/if}}
    + + + @@ -68,13 +77,7 @@ - - +
    {{if $visitor}}