summaryrefslogtreecommitdiffstats
path: root/client/components/main
diff options
context:
space:
mode:
authorMaxime Quandalle <maxime@quandalle.com>2015-12-08 16:05:59 -0500
committerMaxime Quandalle <maxime@quandalle.com>2015-12-09 19:10:26 -0500
commit71b9a42f00d8871bb09944ec80979c61ad84e655 (patch)
tree4ede6eaaea591a0b1c797498a6a8daaaa6cac489 /client/components/main
parent3b2eb0ffa12a0b3cc2eaa0a1e26ed6532e3f5d93 (diff)
downloadwekan-71b9a42f00d8871bb09944ec80979c61ad84e655.tar.gz
wekan-71b9a42f00d8871bb09944ec80979c61ad84e655.tar.bz2
wekan-71b9a42f00d8871bb09944ec80979c61ad84e655.zip
Allow the header bar customization
This commit also provide a way to escape the Shorcuts page on Sandstorm.
Diffstat (limited to 'client/components/main')
-rw-r--r--client/components/main/header.jade13
-rw-r--r--client/components/main/header.styl8
-rw-r--r--client/components/main/keyboardShortcuts.jade19
-rw-r--r--client/components/main/keyboardShortcuts.tpl.jade11
-rw-r--r--client/components/main/layouts.jade1
-rw-r--r--client/components/main/layouts.styl3
6 files changed, 32 insertions, 23 deletions
diff --git a/client/components/main/header.jade b/client/components/main/header.jade
index 86dfd6a7..0d178250 100644
--- a/client/components/main/header.jade
+++ b/client/components/main/header.jade
@@ -32,10 +32,7 @@ template(name="header")
current page. This bar is contextual based.
If the user is not connected we display "sign in" and "log in" buttons.
#header-main-bar(class="{{#if wrappedHeader}}wrapper{{/if}}")
- if $.Session.get 'currentBoard'
- +headerBoard
- else if($eq currentRouteName 'home')
- +headerTitle
+ +Template.dynamic(template=headerBar)
//-
On sandstorm, the logo shouldn't be clickable, because we only have one
@@ -47,11 +44,3 @@ template(name="header")
else
a.wekan-logo(href="{{pathFor 'home'}}" title="{{_ 'header-logo-title'}}")
img(src="{{pathFor '/wekan-logo-header.png'}}" alt="Wekan")
-
-template(name="headerTitle")
- h1 {{_ 'my-boards'}}
-
- .board-header-btns.right
- a.board-header-btn.js-open-archived-board
- i.fa.fa-archive
- span {{_ 'archives'}}
diff --git a/client/components/main/header.styl b/client/components/main/header.styl
index b66eb2da..6decf2df 100644
--- a/client/components/main/header.styl
+++ b/client/components/main/header.styl
@@ -85,6 +85,14 @@
float: left
border-radius: 3px
+ a.fa, a i.fa
+ color: white
+
+ .back-btn
+ font-size: 0.9em
+ margin-right: 10px
+
+
.wekan-logo
display: block
margin: 3px auto 0
diff --git a/client/components/main/keyboardShortcuts.jade b/client/components/main/keyboardShortcuts.jade
new file mode 100644
index 00000000..bde40819
--- /dev/null
+++ b/client/components/main/keyboardShortcuts.jade
@@ -0,0 +1,19 @@
+template(name="shortcutsHeaderBar")
+ h1
+ a.back-btn(href="{{pathFor 'home'}}")
+ i.fa.fa-chevron-left
+ | {{_ 'keyboard-shortcuts'}}
+
+template(name="shortcutsModalTitle")
+ h2
+ i.fa.fa-keyboard-o
+ | {{_ 'keyboard-shortcuts'}}
+
+template(name="keyboardShortcuts")
+ .wrapper.shortcuts-list
+ each mapping
+ .shortcuts-list-item
+ .shortcuts-list-item-keys
+ each keys
+ kbd= this
+ .shortcuts-list-item-action {{_ action}}
diff --git a/client/components/main/keyboardShortcuts.tpl.jade b/client/components/main/keyboardShortcuts.tpl.jade
deleted file mode 100644
index 5b5dae8b..00000000
--- a/client/components/main/keyboardShortcuts.tpl.jade
+++ /dev/null
@@ -1,11 +0,0 @@
-.wrapper.shortcuts-list
- h2
- i.fa.fa-keyboard-o
- | {{_ 'keyboard-shortcuts'}}
-
- each mapping
- .shortcuts-list-item
- .shortcuts-list-item-keys
- each keys
- kbd= this
- .shortcuts-list-item-action {{_ action}}
diff --git a/client/components/main/layouts.jade b/client/components/main/layouts.jade
index 65b53f04..88d178f5 100644
--- a/client/components/main/layouts.jade
+++ b/client/components/main/layouts.jade
@@ -31,6 +31,7 @@ template(name="defaultLayout")
.modal-content
a.modal-close-btn.js-close-modal
i.fa.fa-times-thin
+ +Template.dynamic(template=Modal.getHeaderName)
+Template.dynamic(template=Modal.getTemplateName)
template(name="notFound")
diff --git a/client/components/main/layouts.styl b/client/components/main/layouts.styl
index fcc94251..0e50dd55 100644
--- a/client/components/main/layouts.styl
+++ b/client/components/main/layouts.styl
@@ -31,6 +31,9 @@ body
.sk-spinner
margin-top: 30vh
+ > .wrapper
+ margin-top: 25px
+
#modal
position: absolute
top: 0