From 6c39bdb8292d3ad41358caa1b21a4b03447e32b9 Mon Sep 17 00:00:00 2001
From: Benjamin ter Kuile <bterkuile@gmail.com>
Date: Thu, 24 Jul 2014 15:45:40 +0200
Subject: [PATCH] Layout fixes

---
 app/views/theme1/_navigation.html.slim | 11 ++---------
 app/views/user/obtain_token.html.slim  |  4 ++--
 bin/build_mobile_app.rb                |  8 ++++++++
 3 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/app/views/theme1/_navigation.html.slim b/app/views/theme1/_navigation.html.slim
index 5f2eb7ad..61ddd006 100644
--- a/app/views/theme1/_navigation.html.slim
+++ b/app/views/theme1/_navigation.html.slim
@@ -1,13 +1,6 @@
 .container
-  a.btn.btn-navbar data-toggle="collapse" data-target=".nav-collapse"
-    span.icon-bar
-    span.icon-bar
-    span.icon-bar
-
   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: 'show', name: 'about') ? :active : nil)]= link_to find_page('about').try(:menu_text), page_path('about')
-  .nav-collapse.collapse
-    ul.nav
-      - 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)
+    - 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)
diff --git a/app/views/user/obtain_token.html.slim b/app/views/user/obtain_token.html.slim
index b6136730..ab7e2c5f 100644
--- a/app/views/user/obtain_token.html.slim
+++ b/app/views/user/obtain_token.html.slim
@@ -1,7 +1,7 @@
 .row
   h1 data-t='obtain_token.title' = t('user.obtain_token.title')
   hr
-  form
+  /form
     .form-row
       .form-label
         label.control-label data-t='attributes.user.email' = User.human_attribute_name(:email)
@@ -20,4 +20,4 @@
   javascript:
     Qstorage.setItem('auth_token', '#{current_user.authentication_token}');
     Qstorage.setItem('user_id', '#{current_user.id}');
-    window.location = '#{user_root_path}';
+    window.location = '/index.html';
diff --git a/bin/build_mobile_app.rb b/bin/build_mobile_app.rb
index 7b89e747..722d5fcb 100644
--- a/bin/build_mobile_app.rb
+++ b/bin/build_mobile_app.rb
@@ -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'
 include FileUtils
 #rm_rf Rails.root.join('public', 'assets') # now done in ./make_...