From b390336016cb7b0d60251efd719bbecf635c1945 Mon Sep 17 00:00:00 2001 From: marijus Date: Fri, 28 Feb 2014 23:04:38 +0100 Subject: add hover effect to usermenu caret --- view/tpl/nav.tpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'view/tpl/nav.tpl') diff --git a/view/tpl/nav.tpl b/view/tpl/nav.tpl index 20600ccd7..7d2ce1b7a 100755 --- a/view/tpl/nav.tpl +++ b/view/tpl/nav.tpl @@ -12,7 +12,7 @@ {{if $userinfo}} - {{$userinfo.name}} + {{$userinfo.name}} {{if $localuser}} - - -{{if $langselector}}
{{$langselector}}
{{/if}} - -- cgit v1.2.3 From c028d9b1d0b118d49f2ec6b2f455a2f8cf0a36da Mon Sep 17 00:00:00 2001 From: Thomas Willingham Date: Mon, 3 Mar 2014 17:16:25 +0000 Subject: Partially revert 895c9411d93 Not entirely sure why the lines in question were removed, but this is required as a quick fix for broken notifications. --- view/tpl/nav.tpl | 3 +++ 1 file changed, 3 insertions(+) (limited to 'view/tpl/nav.tpl') diff --git a/view/tpl/nav.tpl b/view/tpl/nav.tpl index 7c2ea817d..da02f86f3 100755 --- a/view/tpl/nav.tpl +++ b/view/tpl/nav.tpl @@ -171,3 +171,6 @@ + -- cgit v1.2.3 From 81c439bc7d4cbe355abaddc46954ec400f98774f Mon Sep 17 00:00:00 2001 From: friendica Date: Mon, 3 Mar 2014 14:33:49 -0800 Subject: revert the temporary fix for the missing hdr.tpl and add the ability to provide context sensitive help/documentation by passing the current URL path to the help module as $_REQUEST['cmd']. So we could create a special help page for settings/display or whatever. The only issue is whether this should be presented first with a link to the main help page, or if we put a line at the top of the main help page that says "I need help for settings/display". Also edited the help target window name, as "friendika-help" is a bit dated. --- view/tpl/nav.tpl | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) (limited to 'view/tpl/nav.tpl') diff --git a/view/tpl/nav.tpl b/view/tpl/nav.tpl index da02f86f3..ec9731fef 100755 --- a/view/tpl/nav.tpl +++ b/view/tpl/nav.tpl @@ -163,7 +163,7 @@ {{if $nav.help}}
  • - +
  • {{/if}} @@ -171,6 +171,3 @@ - -- cgit v1.2.3 From b1c29e91260f4f0d3274efc4fe7ecfa9e5eb7e76 Mon Sep 17 00:00:00 2001 From: marijus Date: Wed, 5 Mar 2014 20:23:13 +0100 Subject: improve navbar collapsed state a little --- view/tpl/nav.tpl | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'view/tpl/nav.tpl') diff --git a/view/tpl/nav.tpl b/view/tpl/nav.tpl index ec9731fef..41bc7dc10 100755 --- a/view/tpl/nav.tpl +++ b/view/tpl/nav.tpl @@ -33,6 +33,10 @@ {{/if}} + {{if $nav.login}}
  • {{$nav.login.1}}
  • {{/if}} + + {{if $nav.alogout}}
  • {{$nav.alogout.1}}
  • {{/if}} + {{if $nav.network}}
  • - +
  • - {{if $nav.login}}
  • {{$nav.login.1}}
  • {{/if}} - - {{if $nav.alogout}}
  • {{$nav.alogout.1}}
  • {{/if}} - {{if $nav.directory}}
  • @@ -155,7 +155,7 @@
  • -- cgit v1.2.3 From e8da840eec218acab2e9d26ee33915679ac88b5c Mon Sep 17 00:00:00 2001 From: marijus Date: Fri, 7 Mar 2014 13:36:49 +0100 Subject: remove aside on navbar collapse and add button to toggle visibility --- view/tpl/nav.tpl | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'view/tpl/nav.tpl') diff --git a/view/tpl/nav.tpl b/view/tpl/nav.tpl index 41bc7dc10..1b35cdcae 100755 --- a/view/tpl/nav.tpl +++ b/view/tpl/nav.tpl @@ -5,6 +5,11 @@ + {{if $localuser}} + + {{/if}} {{if $userinfo}} {{$userinfo.name}} {{if $localuser}} -- cgit v1.2.3 From 21db60c991a5cf9191fb00d5f5f3eb29bff7564c Mon Sep 17 00:00:00 2001 From: marijus Date: Fri, 7 Mar 2014 13:46:45 +0100 Subject: might be needed by not local users aswell --- view/tpl/nav.tpl | 2 -- 1 file changed, 2 deletions(-) (limited to 'view/tpl/nav.tpl') diff --git a/view/tpl/nav.tpl b/view/tpl/nav.tpl index 1b35cdcae..a41bd9659 100755 --- a/view/tpl/nav.tpl +++ b/view/tpl/nav.tpl @@ -5,11 +5,9 @@ - {{if $localuser}} - {{/if}} {{if $userinfo}} {{$userinfo.name}} {{if $localuser}} -- cgit v1.2.3