Dammit… I can't remember what I changed and why
This commit is contained in:
parent
09b0df40f7
commit
dd7527691e
20 changed files with 579 additions and 319 deletions
|
|
@ -3,26 +3,18 @@
|
|||
- if flash
|
||||
- flash.each do |name,msg|
|
||||
- case name
|
||||
- when 'notice'
|
||||
- flash_color = 'white'
|
||||
- flash_bgcolor = 'green'
|
||||
- when 'alert'
|
||||
- flash_color = 'white'
|
||||
- flash_bgcolor = 'red'
|
||||
- when 'timedout'
|
||||
- next
|
||||
- else
|
||||
- flash_color = 'black'
|
||||
- flash_bgcolor = 'gray'
|
||||
|
||||
javascript:
|
||||
$.amaran({
|
||||
'content': {
|
||||
'message' :'#{msg}',
|
||||
'color' : '#{flash_color}',
|
||||
'bgcolor' : '#{flash_bgcolor}'
|
||||
},
|
||||
'position' :'bottom right',
|
||||
'theme' : 'colorful',
|
||||
'delay' : 7000
|
||||
});
|
||||
- when 'timedout'
|
||||
/ Workaround for Devise sometimes sending "true"
|
||||
- next
|
||||
- when 'notice'
|
||||
.callout.warning data-closable=true
|
||||
= fa_icon 'info-circle wobble 2x'
|
||||
strong< = msg
|
||||
- when 'error'
|
||||
.callout.alert data-closable=true
|
||||
= fa_icon 'meh-o wobble 2x'
|
||||
strong< = msg
|
||||
- else
|
||||
.callout.primary data-closable=true
|
||||
= fa_icon 'info-circle wobble 2x'
|
||||
strong< = msg
|
||||
|
|
|
|||
|
|
@ -1,14 +1,14 @@
|
|||
nav.top-bar
|
||||
.row
|
||||
.top-bar-left
|
||||
.top-bar-title
|
||||
.top-bar
|
||||
.top-bar-left
|
||||
ul.menu
|
||||
li.menu-text
|
||||
a href='/'
|
||||
// TODO: Make the logo depend on the virtual host
|
||||
img src="/images/logos/debian.svg" width="35" alt="Debian logo"
|
||||
// TODO: Use proper distribution name
|
||||
' Debian Screenshots >
|
||||
|
||||
.top-bar-right
|
||||
.top-bar-right
|
||||
ul.dropdown.menu data-dropdown-menu=true
|
||||
li class=('active' if controller_name=='welcome' and action_name=='home')
|
||||
a href="/" Home
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue