From 49f06fb22754492e75a49356e58dd69af0678492 Mon Sep 17 00:00:00 2001 From: harukin Date: Wed, 2 Jan 2019 20:33:14 +0900 Subject: [PATCH 01/36] make user-icon moved for right --- view/theme/plusfuture/tpl/navbar_default.tpl | 233 +++++++++++++++++++ 1 file changed, 233 insertions(+) create mode 100755 view/theme/plusfuture/tpl/navbar_default.tpl diff --git a/view/theme/plusfuture/tpl/navbar_default.tpl b/view/theme/plusfuture/tpl/navbar_default.tpl new file mode 100755 index 0000000..86f8065 --- /dev/null +++ b/view/theme/plusfuture/tpl/navbar_default.tpl @@ -0,0 +1,233 @@ +{{if $nav.login && !$userinfo}} +
+ {{if $nav.loginmenu.1.4}} + + {{$nav.loginmenu.1.1}} + + {{else}} + + {{$nav.loginmenu.1.1}} + + {{/if}} + {{if $nav.register}} + + {{$nav.register.1}} + + {{/if}} +
+{{/if}} +
+ {{if $nav.help.6}} + + {{/if}} + + {{if $localuser || $nav.pubs}} + + {{/if}} + +
+ + +{{if $nav.help.6}} +
+ {{$nav.help.5}} +
+  {{$fulldocs}} + +
+
+{{/if}} +{{if $userinfo}} +
+
+ {{$userinfo.name}} + +
+ {{if $is_owner}} +
+ {{foreach $nav.usermenu as $usermenu}} + {{$usermenu.1}} + {{/foreach}} + {{if $nav.group}} + {{$nav.group.1}} + {{/if}} + {{if $nav.manage}} + {{$nav.manage.1}} + {{/if}} + {{if $nav.channels}} + {{foreach $nav.channels as $chan}} + {{$chan.channel_name}} + {{/foreach}} + {{/if}} + {{if $nav.profiles}} + {{$nav.profiles.1}} + {{/if}} + {{if $nav.settings}} +
+ {{$nav.settings.1}} + {{/if}} + {{if $nav.admin}} +
+ {{$nav.admin.1}} + {{/if}} + {{if $nav.logout}} +
+ {{$nav.logout.1}} + {{/if}} +
+ {{/if}} + {{if ! $is_owner}} + + {{/if}} +
+{{if $sel.name}} + +{{if $settings_url}} + +{{/if}} +{{/if}} +{{/if}} \ No newline at end of file From 2a525e2f53d85425cb32fa783612344e84eee591 Mon Sep 17 00:00:00 2001 From: harukin Date: Wed, 2 Jan 2019 20:48:16 +0900 Subject: [PATCH 02/36] fix dropdown position & edit name and setting icon position --- view/theme/plusfuture/css/style.css | 5 +++ view/theme/plusfuture/tpl/navbar_default.tpl | 36 ++++++++++---------- 2 files changed, 23 insertions(+), 18 deletions(-) diff --git a/view/theme/plusfuture/css/style.css b/view/theme/plusfuture/css/style.css index ddaeb68..59e40fb 100644 --- a/view/theme/plusfuture/css/style.css +++ b/view/theme/plusfuture/css/style.css @@ -2194,3 +2194,8 @@ a[title*="pawoo.net"]::after { .comment-edit-preview .toplevel_item { width: calc(100% - 16px); } + +.dropdown-menu.show{ + position: absolute; + left: -215px; +} \ No newline at end of file diff --git a/view/theme/plusfuture/tpl/navbar_default.tpl b/view/theme/plusfuture/tpl/navbar_default.tpl index 86f8065..df9962c 100755 --- a/view/theme/plusfuture/tpl/navbar_default.tpl +++ b/view/theme/plusfuture/tpl/navbar_default.tpl @@ -16,6 +16,24 @@ {{/if}} {{/if}} +{{if $sel.name}} + +{{if $settings_url}} + +{{/if}} +{{/if}}
{{if $nav.help.6}}
{{/if}} -{{if $sel.name}} - -{{if $settings_url}} - -{{/if}} -{{/if}} {{/if}} \ No newline at end of file From d99d880755b1f8473c20a5f83b9fea16e44b8379 Mon Sep 17 00:00:00 2001 From: harukin Date: Wed, 2 Jan 2019 21:02:42 +0900 Subject: [PATCH 03/36] edit move noti/expand button --- view/theme/plusfuture/tpl/navbar_default.tpl | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/view/theme/plusfuture/tpl/navbar_default.tpl b/view/theme/plusfuture/tpl/navbar_default.tpl index df9962c..d78335f 100755 --- a/view/theme/plusfuture/tpl/navbar_default.tpl +++ b/view/theme/plusfuture/tpl/navbar_default.tpl @@ -16,6 +16,10 @@ {{/if}} {{/if}} + + {{if $sel.name}} - -{{if $nav.help.6}} -
- {{$nav.help.5}} -
-  {{$fulldocs}} - -
-
-{{/if}} -{{if $userinfo}} +{if $userinfo}}
{{$userinfo.name}} @@ -231,4 +195,41 @@
{{/if}}
-{{/if}} \ No newline at end of file +{{/if}} + +{{if $nav.help.6}} +
+ {{$nav.help.5}} +
+  {{$fulldocs}} + +
+
+{{/if}} +{ \ No newline at end of file From 01f49d72c4c2b7b44352d16b5f159fb3b99c1229 Mon Sep 17 00:00:00 2001 From: harukin Date: Wed, 2 Jan 2019 21:13:17 +0900 Subject: [PATCH 05/36] fix typo --- view/theme/plusfuture/tpl/navbar_default.tpl | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/view/theme/plusfuture/tpl/navbar_default.tpl b/view/theme/plusfuture/tpl/navbar_default.tpl index d37ee77..289972f 100755 --- a/view/theme/plusfuture/tpl/navbar_default.tpl +++ b/view/theme/plusfuture/tpl/navbar_default.tpl @@ -149,7 +149,7 @@ -{if $userinfo}} +{{if $userinfo}}
{{$userinfo.name}} @@ -231,5 +231,4 @@
-{{/if}} -{ \ No newline at end of file +{{/if}} \ No newline at end of file From 1855c879cb77fdd69c4400045735558eb112dd55 Mon Sep 17 00:00:00 2001 From: harukin Date: Wed, 2 Jan 2019 21:58:46 +0900 Subject: [PATCH 06/36] edit title position --- view/theme/plusfuture/tpl/navbar_default.tpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/view/theme/plusfuture/tpl/navbar_default.tpl b/view/theme/plusfuture/tpl/navbar_default.tpl index 289972f..b53bef2 100755 --- a/view/theme/plusfuture/tpl/navbar_default.tpl +++ b/view/theme/plusfuture/tpl/navbar_default.tpl @@ -30,6 +30,7 @@ + {{if $settings_url}} {{if $userinfo}} From 30d4b3eff4dc661c3b70b6d5b042bcd3930c1334 Mon Sep 17 00:00:00 2001 From: harukin Date: Fri, 4 Jan 2019 17:41:13 +0900 Subject: [PATCH 17/36] edit leftmenu icon renew. --- view/theme/plusfuture/tpl/navbar_default.tpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/view/theme/plusfuture/tpl/navbar_default.tpl b/view/theme/plusfuture/tpl/navbar_default.tpl index 329ada1..98d1acb 100755 --- a/view/theme/plusfuture/tpl/navbar_default.tpl +++ b/view/theme/plusfuture/tpl/navbar_default.tpl @@ -18,7 +18,7 @@ {{/if}} From 1209496a29c4ae4c538f1034add51c6b8111b48c Mon Sep 17 00:00:00 2001 From: harukin Date: Sun, 6 Jan 2019 16:03:05 +0900 Subject: [PATCH 18/36] test:: navbar-margin fix --- view/theme/plusfuture/tpl/navbar_default.tpl | 154 +++++++++---------- 1 file changed, 77 insertions(+), 77 deletions(-) diff --git a/view/theme/plusfuture/tpl/navbar_default.tpl b/view/theme/plusfuture/tpl/navbar_default.tpl index 98d1acb..80582e6 100755 --- a/view/theme/plusfuture/tpl/navbar_default.tpl +++ b/view/theme/plusfuture/tpl/navbar_default.tpl @@ -16,46 +16,32 @@ {{/if}} {{/if}} - +
+ + {{if $sel.name}} + - -{{if $sel.name}} - - -{{if $settings_url}} - -{{/if}} -{{/if}} -
- {{if $nav.help.6}} - + {{if $settings_url}} + {{/if}} - - {{if $localuser || $nav.pubs}} - {{/if}}
+ + -{{if $userinfo}} -
-
- {{$userinfo.name}} - -
- {{if $is_owner}} -
- {{foreach $nav.usermenu as $usermenu}} - {{$usermenu.1}} - {{/foreach}} - {{if $nav.group}} - {{$nav.group.1}} +
+
+ {{if $nav.help.6}} + {{/if}} - {{if $nav.manage}} - {{$nav.manage.1}} - {{/if}} - {{if $nav.channels}} - {{foreach $nav.channels as $chan}} - {{$chan.channel_name}} - {{/foreach}} - {{/if}} - {{if $nav.profiles}} - {{$nav.profiles.1}} - {{/if}} - {{if $nav.settings}} -
- {{$nav.settings.1}} - {{/if}} - {{if $nav.admin}} -
- {{$nav.admin.1}} - {{/if}} - {{if $nav.logout}} -
- {{$nav.logout.1}} + + {{if $localuser || $nav.pubs}} + {{/if}}
- {{/if}} - {{if ! $is_owner}} - -{{/if}}