Layout fixes

This commit is contained in:
2014-07-24 15:45:40 +02:00
parent f2f3d294dd
commit 6c39bdb829
3 changed files with 12 additions and 11 deletions
+2 -9
View File
@@ -1,13 +1,6 @@
.container .container
a.btn.btn-navbar data-toggle="collapse" data-target=".nav-collapse"
span.icon-bar
span.icon-bar
span.icon-bar
ul.nav ul.nav
li[class=(current_page?(controller: '/pages', action: 'home') ? :active : nil)]= link_to find_page('home').try(:menu_text), locale_root_path li[class=(current_page?(controller: '/pages', action: 'home') ? :active : nil)]= link_to find_page('home').try(:menu_text), locale_root_path
li[class=(current_page?(controller: '/pages', action: 'show', name: 'about') ? :active : nil)]= link_to find_page('about').try(:menu_text), page_path('about') li[class=(current_page?(controller: '/pages', action: 'show', name: 'about') ? :active : nil)]= link_to find_page('about').try(:menu_text), page_path('about')
.nav-collapse.collapse - Page.top_menu.each do |page|
ul.nav li[class=(current_page?(controller: '/pages', action: 'show', name: page.name) ? :active : nil)]= link_to page.menu_text, page_path(page.name)
- Page.top_menu.each do |page|
li[class=(current_page?(controller: '/pages', action: 'show', name: page.name) ? :active : nil)]= link_to page.menu_text, page_path(page.name)
+2 -2
View File
@@ -1,7 +1,7 @@
.row .row
h1 data-t='obtain_token.title' = t('user.obtain_token.title') h1 data-t='obtain_token.title' = t('user.obtain_token.title')
hr hr
form /form
.form-row .form-row
.form-label .form-label
label.control-label data-t='attributes.user.email' = User.human_attribute_name(:email) label.control-label data-t='attributes.user.email' = User.human_attribute_name(:email)
@@ -20,4 +20,4 @@
javascript: javascript:
Qstorage.setItem('auth_token', '#{current_user.authentication_token}'); Qstorage.setItem('auth_token', '#{current_user.authentication_token}');
Qstorage.setItem('user_id', '#{current_user.id}'); Qstorage.setItem('user_id', '#{current_user.id}');
window.location = '#{user_root_path}'; window.location = '/index.html';
+8
View File
@@ -1,3 +1,11 @@
###
# This script build a mobile app for the android and ios cordova projects.
# If the environment variable TEST_HOST is set it will be used as mobile app host
# for all the requests
#
#
###
require 'fileutils' require 'fileutils'
include FileUtils include FileUtils
#rm_rf Rails.root.join('public', 'assets') # now done in ./make_... #rm_rf Rails.root.join('public', 'assets') # now done in ./make_...