Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Added more parts to the overview section

  • Loading branch information...
commit 9088ccc3fbe251eb837de0fb38c93cae9ebdf589 1 parent 7208c02
@ivik authored
Showing with 34 additions and 57 deletions.
  1. +20 −19 app/views/home/index.html.haml
  2. +14 −38 app/views/layouts/_header.html.haml
View
39 app/views/home/index.html.haml
@@ -8,7 +8,7 @@
%a{"data-toggle" => "tab", :href => "#customer_1236"} 2331003, Långben
%li.dropdown
%a.dropdown-toggle{"data-toggle" => "dropdown", :href => "#"}
- Dropdown
+ Mer
%b.caret
%ul.dropdown-menu
%li
@@ -26,11 +26,11 @@
%button.btn.btn-info.btn-small Tjänster
%button.btn.btn-info.btn-small Fakturor
%button.btn.btn-info.btn-small Information
- %span.label.label-success
- 2331001, Kalle Anka, 1980-01-01-0001
.span
.span.offset
- %h3
+ %span.label.label-success
+ 2331001, Kalle Anka, 1980-01-01-0001
+ %h4
Kundinfo
%table.table
%thead
@@ -89,10 +89,10 @@
Land:
%td
Sverige
- .span6.offset1
+ .span7.offset1
.row-fluid
.span12
- %h3
+ %h4
Tjänster
#accordion2.accordion
.accordion-group
@@ -103,15 +103,15 @@
Bredband 1st
#collapseOne.accordion-body.collapse
.accordion-inner
+ %li
+ Malmö - MKB
.span
- Malmö ->
- MKB ->
- .span
- %a{:href => "#dropdown_customer_2236"} 100Mbit Privat - 300kr Aktivt
- %br
- 100Mbit Privat - 250kr NÅÅTT
- %br
- 100Mbit Privat - 210kr NÅÅTT
+ %li
+ %a{:href => "#dropdown_customer_2236"} 100Mbit Privat - 300kr Aktivt
+ %li
+ 100Mbit Privat - 250kr Ej Aktivt
+ %li
+ 100Mbit Privat - 210kr Ej Aktivt
.accordion-group
.accordion-heading
@@ -121,7 +121,9 @@
Mobilt Bredband 1st
#collapseTwo.accordion-body.collapse
.accordion-inner
- %a{:href => "#dropdown_customer_2236"} Medium - 200kr
+ %li
+ Mobilt Bredband Large
+ %a{:href => "#dropdown_customer_2236"} 200kr
.accordion-group
.accordion-heading
%a.accordion-toggle{"data-parent" => "#accordion2", "data-toggle" => "collapse", :href => "#collapseThree"}
@@ -135,13 +137,12 @@
.accordion-heading
%a.accordion-toggle{"data-parent" => "#accordion2", "data-toggle" => "collapse", :href => "#collapseThree"}
%strong
- .text-error
- Säkerhetspaket 0st
+ Säkerhetspaket 0st
#collapseThree.accordion-body.collapse
.accordion-inner
.row-fluid
.span12
- %h3
+ %h4
Fakturor
%table.table.table-striped
%thead
@@ -214,7 +215,7 @@
%td
Skickat
.span.offset1
- %h3
+ %h4
Kommentarer
%table.table.table-condensed
%thead
View
52 app/views/layouts/_header.html.haml
@@ -1,7 +1,7 @@
.navbar.navbar-inverse.navbar-fixed-top
.navbar-inner
.container-fluid
- .span3
+ .span-pull-left
= link_to "Logo", root_path, class: "brand"
%ul.nav
%li.active
@@ -19,41 +19,17 @@
%li= link_to "Provider Editorn", ""
%li.divider
%li
- = link_to "Sign out", "", method: "delete"
- .span7
+ = link_to "Admin", ""
+ .span8
.center
- %form.form-inline.inline_field_wrapper
- %input.input-large.search-query{:type => "text"}
- %button.btn.btn-primary{:type => "submit"} Search
- .span
- = simple_form_for(:session, url: "", html: {class: 'navbar-form pull-right' }) do |f|
- = f.input :email, :wrapper_html => { :class => "inline_field_wrapper" }, label: false, input_html: {class: "span2", placeholder: "Email" }
- = f.input :password, :wrapper_html => { :class => "inline_field_wrapper" }, label: false, input_html: {class: "span2", placeholder: "Password" }
- = f.submit "Sign in", class: "btn"
-
- -#- if !signed_in?
- -# = simple_form_for(:session, url: sessions_path, html: {class: 'navbar-form pull-right' }) do |f|
- -# = f.input :email, :wrapper_html => { :class => "inline_field_wrapper" }, label: false, input_html: {class: "span2", placeholder: "Email" }
- -# = f.input :password, :wrapper_html => { :class => "inline_field_wrapper" }, label: false, input_html: {class: "span2", placeholder: "Password" }
- -# = f.submit "Sign in", class: "btn"
- -#- else
- %ul.nav.pull-right
- -#%li#fat-menu.dropdown
- -# %a.dropdown-toggle{:href => "#", "data-toggle" => "dropdown"}
- -# Yearbooks
- -# %b.caret
- -# %ul.dropdown-menu
- -# %li= link_to "Show All", yearbooks_path
- -# %li= link_to "Create New", new_yearbook_path
- %li#fat-menu.dropdown
- %a.dropdown-toggle{:href => "#", "data-toggle" => "dropdown"}
- Account
- %b.caret
- %ul.dropdown-menu
- %li= link_to "Profile", current_user
- %li= link_to "Settings", edit_user_path(current_user)
- %li.divider
- %li
- = link_to "Sign out", signout_path, method: "delete"
- -if current_user.admin?
- %li= link_to "Users", users_path
+ %form.form-inline
+ %input.input-large{:type => "text"}
+ %button.btn.btn-small.btn-primary{:type => "submit"} Search
+ .span.offset.pull-right
+ Erfan Shirazi
+ = link_to "(Logga ut)", ""
+ -#.span.offset.pull-right
+ -# = simple_form_for(:session, url: "", html: {class: 'navbar-form pull-right' }) do |f|
+ -# = f.input :email, :wrapper_html => { :class => "inline_field_wrapper" }, label: false, input_html: {class: "span2", placeholder: "Email" }
+ -# = f.input :password, :wrapper_html => { :class => "inline_field_wrapper" }, label: false, input_html: {class: "span2", placeholder: "Password" }
+ -# = f.submit "Sign in", class: "btn"
Please sign in to comment.
Something went wrong with that request. Please try again.