summaryrefslogtreecommitdiff
path: root/app
diff options
context:
space:
mode:
authorAzul <azul@leap.se>2012-12-07 08:28:23 +0100
committerAzul <azul@leap.se>2012-12-07 08:28:23 +0100
commit1ec55c4f562a4fdd57c50077ff286ef08e9978a1 (patch)
tree16203d2ca4f32e24d38fef6062aa9534cecb3bfe /app
parenteffa6b0f84cfe954cc9dd73f592663b743b0d857 (diff)
parenta3dce077881c7e97090e5e560b1fb004952d5b23 (diff)
Merge branch 'develop'
Diffstat (limited to 'app')
-rw-r--r--app/assets/javascripts/application.js3
-rw-r--r--app/assets/stylesheets/application.scss13
-rw-r--r--app/controllers/application_controller.rb2
-rw-r--r--app/views/home/index.html.haml9
-rw-r--r--app/views/layouts/_navigation.html.haml6
-rw-r--r--app/views/layouts/application.html.erb14
-rw-r--r--app/views/layouts/application.html.haml23
7 files changed, 55 insertions, 15 deletions
diff --git a/app/assets/javascripts/application.js b/app/assets/javascripts/application.js
index a0b89db..f7ca1ec 100644
--- a/app/assets/javascripts/application.js
+++ b/app/assets/javascripts/application.js
@@ -15,3 +15,6 @@
//= require srp
//= require users
//= require_tree .
+//= require bootstrap
+//= require rails.validations
+//= require rails.validations.simple_form
diff --git a/app/assets/stylesheets/application.scss b/app/assets/stylesheets/application.scss
index cbd46a7..8dec07d 100644
--- a/app/assets/stylesheets/application.scss
+++ b/app/assets/stylesheets/application.scss
@@ -1 +1,14 @@
@import "bootstrap";
+body {
+ padding: 40px;
+}
+@import "bootstrap-responsive";
+
+
+table.table-hover .btn {
+ opacity: 0;
+}
+
+table.table-hover tr:hover .btn {
+ opacity: 1;
+}
diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
index e8065d9..be7aa1f 100644
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -1,3 +1,5 @@
class ApplicationController < ActionController::Base
protect_from_forgery
+
+ ActiveSupport.run_load_hooks(:application_controller, self)
end
diff --git a/app/views/home/index.html.haml b/app/views/home/index.html.haml
index 11f18de..9e68674 100644
--- a/app/views/home/index.html.haml
+++ b/app/views/home/index.html.haml
@@ -1,4 +1,11 @@
-%h1 Leap Web Demo
Try to fetch a
= link_to "cert", cert_path
+
+%p
+Try to create a
+= link_to "ticket", new_ticket_path
+
+%p
+See all
+= link_to "tickets", tickets_path
diff --git a/app/views/layouts/_navigation.html.haml b/app/views/layouts/_navigation.html.haml
new file mode 100644
index 0000000..b75eed7
--- /dev/null
+++ b/app/views/layouts/_navigation.html.haml
@@ -0,0 +1,6 @@
+= link_to "Leap Web", root_path, :class => 'brand'
+%ul.nav
+ // = render '/tickets/nav'
+
+%ul.nav.pull-right
+ = render '/sessions/nav'
diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb
deleted file mode 100644
index ce68ec8..0000000
--- a/app/views/layouts/application.html.erb
+++ /dev/null
@@ -1,14 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
- <title>LeapWeb</title>
- <%= stylesheet_link_tag "application", :media => "all" %>
- <%= javascript_include_tag "application" %>
- <%= csrf_meta_tags %>
-</head>
-<body>
-
-<%= yield %>
-
-</body>
-</html>
diff --git a/app/views/layouts/application.html.haml b/app/views/layouts/application.html.haml
new file mode 100644
index 0000000..a57d65e
--- /dev/null
+++ b/app/views/layouts/application.html.haml
@@ -0,0 +1,23 @@
+!!!
+%html
+ %head
+ %meta{:content => "width=device-width, initial-scale=1.0", :name => "viewport"}
+ %title= content_for?(:title) ? yield(:title) : "Leap Web"
+ %meta{:content => content_for?(:description) ? yield(:description) : "Leap Web", :name => "description"}
+ = stylesheet_link_tag "application", :media => "all"
+ = javascript_include_tag "application"
+ = csrf_meta_tags
+ = yield(:head)
+ %body
+ %header.navbar.navbar-fixed-top
+ %nav.navbar-inner
+ .container
+ = render 'layouts/navigation'
+ #main{:role => "main"}
+ .container
+ .content
+ .row
+ .span12
+ //= render 'layouts/messages'
+ = yield
+ %footer