FreakU
/
Retrospring
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

added site_name to the promotion box, removed "Front" navbar entry for non-registered users

This commit is contained in:
nilsding 2014-11-11 06:41:04 +01:00
parent aaf1fbf42b
commit c19f44f527
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/views/layouts/_header.html.haml
View File

@ -8,9 +8,9 @@
%span.icon-bar %span.icon-bar
%a.navbar-brand{href: "/"}= APP_CONFIG['site_name'] %a.navbar-brand{href: "/"}= APP_CONFIG['site_name']
#j2-main-navbar-collapse.collapse.navbar-collapse #j2-main-navbar-collapse.collapse.navbar-collapse
%ul.nav.navbar-nav
= nav_entry "Front", root_path
- if user_signed_in? - if user_signed_in?
%ul.nav.navbar-nav
= nav_entry "Timeline", root_path
%ul.nav.navbar-nav %ul.nav.navbar-nav
= nav_entry "Inbox", "/inbox", badge: inbox_count, badge_color: 'danger' = nav_entry "Inbox", "/inbox", badge: inbox_count, badge_color: 'danger'
%ul.nav.navbar-nav.navbar-right %ul.nav.navbar-nav.navbar-right

5
app/views/shared/_questionbox.html.haml
View File

@ -32,7 +32,10 @@
.row .row
.col-sm-1 .col-sm-1
.col-xs-12.col-sm-10 .col-xs-12.col-sm-10
%small Join justask2 today! You'll be able to follow and ask people you know and a lot more. %small
Join
= APP_CONFIG['site_name']
today! You'll be able to follow and ask people you know and a lot more.
.col-sm-1 .col-sm-1
/ %p / %p
/ This user does not want to get asked by strangers. Why don't you / This user does not want to get asked by strangers. Why don't you