From c16fda1cb6fef84788d3045b0edff367d2978c98 Mon Sep 17 00:00:00 2001 From: Max Kostikov Date: Sat, 25 Aug 2018 21:16:05 +0200 Subject: [PATCH 01/12] Update wiki.tpl --- view/tpl/wiki.tpl | 856 +++++++++++++++++++++++----------------------- 1 file changed, 428 insertions(+), 428 deletions(-) diff --git a/view/tpl/wiki.tpl b/view/tpl/wiki.tpl index 6ca4b0c77..b7bb80dfd 100644 --- a/view/tpl/wiki.tpl +++ b/view/tpl/wiki.tpl @@ -1,476 +1,476 @@
-
-
- [{{$typename}}]  - {{if $showPageControls}} - - {{/if}} - - - -
-

- {{$wikiheaderName}}: - {{$wikiheaderPage}} -

-
-
- -
- -
-
- {{if !$mimeType || $mimeType == 'text/markdown'}} -
- {{else}} -
- -
- {{/if}} -
-
-
- {{$renderedContent}} -
-
-
-
-
- {{if $showPageControls}} - - {{/if}} -
-
+
+
+ [{{$typename}}]  + {{if $showPageControls}} + + {{/if}} + + + +
+

+ {{$wikiheaderName}}: + {{$wikiheaderPage}} +

+
+
+ +
+ +
+
+ {{if !$mimeType || $mimeType == 'text/markdown'}} +
+ {{else}} +
+ +
+ {{/if}} +
+
+
+ {{$renderedContent}} +
+
+
+
+
+ {{if $showPageControls}} + + {{/if}} +
+
{{$wikiModal}} + $(window).resize(function () { + if($('main').hasClass('fullscreen')) { + adjustFullscreenEditorHeight(); + } + }); + \ No newline at end of file From 732ce25d7fb78caf23bfe8f339bd0f0708279979 Mon Sep 17 00:00:00 2001 From: Max Kostikov Date: Sat, 25 Aug 2018 21:17:25 +0200 Subject: [PATCH 02/12] Update nwiki_page_history.tpl --- view/tpl/nwiki_page_history.tpl | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/view/tpl/nwiki_page_history.tpl b/view/tpl/nwiki_page_history.tpl index b1c6c9284..6926cca2d 100644 --- a/view/tpl/nwiki_page_history.tpl +++ b/view/tpl/nwiki_page_history.tpl @@ -43,17 +43,17 @@ {{foreach $pageHistory as $commit}} - +
Date{{$commit.date}}
{{$date_lbl}}{{$commit.date}} - {{if $permsWrite}} - + {{if $permsWrite}} +

- {{/if}} - + {{/if}} +
{{$name_lbl}}{{$commit.name}}
{{$msg_label}}{{$commit.title}}
- {{/foreach}} - + {{/foreach}} + \ No newline at end of file From 67a9dd84975d4689a1046074f368cc0543100324 Mon Sep 17 00:00:00 2001 From: Max Kostikov Date: Sat, 25 Aug 2018 21:20:00 +0200 Subject: [PATCH 03/12] Update NativeWikiPage.php --- Zotlabs/Lib/NativeWikiPage.php | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/Zotlabs/Lib/NativeWikiPage.php b/Zotlabs/Lib/NativeWikiPage.php index 919c51276..f129217c5 100644 --- a/Zotlabs/Lib/NativeWikiPage.php +++ b/Zotlabs/Lib/NativeWikiPage.php @@ -556,7 +556,10 @@ class NativeWikiPage { '$pageHistory' => $pageHistory['history'], '$permsWrite' => $arr['permsWrite'], '$name_lbl' => t('Name'), - '$msg_label' => t('Message','wiki_history') + '$msg_label' => t('Message','wiki_history'), + '$date_lbl' => t('Date'), + '$revert_btn' => t('Revert'), + '$compare_btn' => t('Compare') )); } @@ -692,4 +695,4 @@ class NativeWikiPage { return $o; } -} +} \ No newline at end of file From 308dda1587bc175cab41bc4a02dae8ec568668b3 Mon Sep 17 00:00:00 2001 From: Max Kostikov Date: Sat, 25 Aug 2018 21:21:57 +0200 Subject: [PATCH 04/12] Update Wiki.php --- Zotlabs/Module/Wiki.php | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Zotlabs/Module/Wiki.php b/Zotlabs/Module/Wiki.php index 322a3933c..548a83c22 100644 --- a/Zotlabs/Module/Wiki.php +++ b/Zotlabs/Module/Wiki.php @@ -384,6 +384,8 @@ class Wiki extends \Zotlabs\Web\Controller { '$modalerrorlist' => t('Error getting album list'), '$modalerrorlink' => t('Error getting photo link'), '$modalerroralbum' => t('Error getting album'), + '$view_lbl' => t('View'), + '$history_lbl' => t('History') )); if($p['pageMimeType'] === 'text/markdown') From 88ebcb56e7d1f70a594f3f11b0d209e084a3521a Mon Sep 17 00:00:00 2001 From: Max Kostikov Date: Sat, 25 Aug 2018 21:23:08 +0200 Subject: [PATCH 05/12] Update Wiki_page_history.php --- Zotlabs/Widget/Wiki_page_history.php | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/Zotlabs/Widget/Wiki_page_history.php b/Zotlabs/Widget/Wiki_page_history.php index dcec9a037..0f865f12d 100644 --- a/Zotlabs/Widget/Wiki_page_history.php +++ b/Zotlabs/Widget/Wiki_page_history.php @@ -20,7 +20,10 @@ class Wiki_page_history { '$pageHistory' => $pageHistory['history'], '$permsWrite' => $arr['permsWrite'], '$name_lbl' => t('Name'), - '$msg_label' => t('Message','wiki_history') + '$msg_label' => t('Message','wiki_history'), + '$date_lbl' => t('Date'), + '$revert_btn' => t('Revert'), + '$compare_btn' => t('Compare') )); } From e78a4d61d85bac570a63086ec1af68eee3c9c9b0 Mon Sep 17 00:00:00 2001 From: Max Kostikov Date: Sat, 25 Aug 2018 21:25:26 +0200 Subject: [PATCH 06/12] Update NativeWikiPage.php --- Zotlabs/Lib/NativeWikiPage.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Zotlabs/Lib/NativeWikiPage.php b/Zotlabs/Lib/NativeWikiPage.php index f129217c5..d4875bbaf 100644 --- a/Zotlabs/Lib/NativeWikiPage.php +++ b/Zotlabs/Lib/NativeWikiPage.php @@ -557,9 +557,9 @@ class NativeWikiPage { '$permsWrite' => $arr['permsWrite'], '$name_lbl' => t('Name'), '$msg_label' => t('Message','wiki_history'), - '$date_lbl' => t('Date'), - '$revert_btn' => t('Revert'), - '$compare_btn' => t('Compare') + '$date_lbl' => t('Date'), + '$revert_btn' => t('Revert'), + '$compare_btn' => t('Compare') )); } @@ -695,4 +695,4 @@ class NativeWikiPage { return $o; } -} \ No newline at end of file +} From c9b80a3612755628cbb6af57458006dd39cf0f5f Mon Sep 17 00:00:00 2001 From: Max Kostikov Date: Sat, 25 Aug 2018 21:26:50 +0200 Subject: [PATCH 07/12] Update Wiki.php --- Zotlabs/Module/Wiki.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Zotlabs/Module/Wiki.php b/Zotlabs/Module/Wiki.php index 548a83c22..25ecb6a6a 100644 --- a/Zotlabs/Module/Wiki.php +++ b/Zotlabs/Module/Wiki.php @@ -384,8 +384,8 @@ class Wiki extends \Zotlabs\Web\Controller { '$modalerrorlist' => t('Error getting album list'), '$modalerrorlink' => t('Error getting photo link'), '$modalerroralbum' => t('Error getting album'), - '$view_lbl' => t('View'), - '$history_lbl' => t('History') + '$view_lbl' => t('View'), + '$history_lbl' => t('History') )); if($p['pageMimeType'] === 'text/markdown') From 42c5e986707ffaa660b4fda9f23edbae9a3cb639 Mon Sep 17 00:00:00 2001 From: Max Kostikov Date: Sat, 25 Aug 2018 21:27:20 +0200 Subject: [PATCH 08/12] Update Wiki_page_history.php --- Zotlabs/Widget/Wiki_page_history.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Zotlabs/Widget/Wiki_page_history.php b/Zotlabs/Widget/Wiki_page_history.php index 0f865f12d..dbb322dc3 100644 --- a/Zotlabs/Widget/Wiki_page_history.php +++ b/Zotlabs/Widget/Wiki_page_history.php @@ -21,9 +21,9 @@ class Wiki_page_history { '$permsWrite' => $arr['permsWrite'], '$name_lbl' => t('Name'), '$msg_label' => t('Message','wiki_history'), - '$date_lbl' => t('Date'), - '$revert_btn' => t('Revert'), - '$compare_btn' => t('Compare') + '$date_lbl' => t('Date'), + '$revert_btn' => t('Revert'), + '$compare_btn' => t('Compare') )); } From ff1a0d217ff769a2e6e622915cb7e9d9eff327b5 Mon Sep 17 00:00:00 2001 From: Max Kostikov Date: Sat, 25 Aug 2018 21:29:25 +0200 Subject: [PATCH 09/12] Update wiki.tpl --- view/tpl/wiki.tpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/view/tpl/wiki.tpl b/view/tpl/wiki.tpl index b7bb80dfd..55e44a0c5 100644 --- a/view/tpl/wiki.tpl +++ b/view/tpl/wiki.tpl @@ -473,4 +473,4 @@ adjustFullscreenEditorHeight(); } }); - \ No newline at end of file + From 6767ff5434a17a04cfcaa14eedd616abb0bf80c9 Mon Sep 17 00:00:00 2001 From: Max Kostikov Date: Sat, 25 Aug 2018 21:30:58 +0200 Subject: [PATCH 10/12] Revert "Update wiki.tpl" This reverts commit ff1a0d217ff769a2e6e622915cb7e9d9eff327b5 --- view/tpl/wiki.tpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/view/tpl/wiki.tpl b/view/tpl/wiki.tpl index 55e44a0c5..b7bb80dfd 100644 --- a/view/tpl/wiki.tpl +++ b/view/tpl/wiki.tpl @@ -473,4 +473,4 @@ adjustFullscreenEditorHeight(); } }); - + \ No newline at end of file From 44f639f371340e086843e655f7e47e220c5665f2 Mon Sep 17 00:00:00 2001 From: Max Kostikov Date: Sat, 25 Aug 2018 21:31:47 +0200 Subject: [PATCH 11/12] Revert "Update wiki.tpl" This reverts commit c16fda1cb6fef84788d3045b0edff367d2978c98 --- view/tpl/wiki.tpl | 856 +++++++++++++++++++++++----------------------- 1 file changed, 428 insertions(+), 428 deletions(-) diff --git a/view/tpl/wiki.tpl b/view/tpl/wiki.tpl index b7bb80dfd..6ca4b0c77 100644 --- a/view/tpl/wiki.tpl +++ b/view/tpl/wiki.tpl @@ -1,476 +1,476 @@
-
-
- [{{$typename}}]  - {{if $showPageControls}} - - {{/if}} - - - -
-

- {{$wikiheaderName}}: - {{$wikiheaderPage}} -

-
-
- -
- -
-
- {{if !$mimeType || $mimeType == 'text/markdown'}} -
- {{else}} -
- -
- {{/if}} -
-
-
- {{$renderedContent}} -
-
-
-
-
- {{if $showPageControls}} - - {{/if}} -
-
+
+
+ [{{$typename}}]  + {{if $showPageControls}} + + {{/if}} + + + +
+

+ {{$wikiheaderName}}: + {{$wikiheaderPage}} +

+
+
+ +
+ +
+
+ {{if !$mimeType || $mimeType == 'text/markdown'}} +
+ {{else}} +
+ +
+ {{/if}} +
+
+
+ {{$renderedContent}} +
+
+
+
+
+ {{if $showPageControls}} + + {{/if}} +
+
{{$wikiModal}} \ No newline at end of file + $(window).resize(function () { + if($('main').hasClass('fullscreen')) { + adjustFullscreenEditorHeight(); + } + }); + From f5f6ec3d71acb3e0488386819d5060e59331ec23 Mon Sep 17 00:00:00 2001 From: Max Kostikov Date: Sat, 25 Aug 2018 21:34:58 +0200 Subject: [PATCH 12/12] Update wiki.tpl --- view/tpl/wiki.tpl | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/view/tpl/wiki.tpl b/view/tpl/wiki.tpl index 6ca4b0c77..0f725749f 100644 --- a/view/tpl/wiki.tpl +++ b/view/tpl/wiki.tpl @@ -42,8 +42,8 @@