From 7da6c6cad460bdca2330da276e0bcbdb043ee385 Mon Sep 17 00:00:00 2001 From: Reinier Balt Date: Sat, 22 Jun 2013 13:48:06 +0200 Subject: [PATCH] add navigation to application layout --- app/assets/images/favicon.ico | Bin 0 -> 1406 bytes app/assets/stylesheets/tracks.css.scss | 24 +++++++-- app/views/layouts/application.html.erb | 49 ++++------------- app/views/layouts/login.html.erb | 2 +- app/views/login/login.html.erb | 1 - app/views/shared/_navbar.html.erb | 72 +++++++++++++++++++++++++ 6 files changed, 102 insertions(+), 46 deletions(-) create mode 100644 app/assets/images/favicon.ico create mode 100644 app/views/shared/_navbar.html.erb diff --git a/app/assets/images/favicon.ico b/app/assets/images/favicon.ico new file mode 100644 index 0000000000000000000000000000000000000000..861f34a38418986a1a91da26c4bcef0d6fadd431 GIT binary patch literal 1406 zcmeHFS4@*p6#jli#f=O1M#WJFA}wuYi*0}S8D&&NRB+ZowN?~y<08hG=!;PkMJ0&h zh?JI=s_{vUsDN<*iXeo@&?uBDEv={En~y%3cy8_)UvBRG&UY@r&~kG_mu=_;xKrjy z+X+pg&A^pB5WsYWKb*tiz?z3~xLcivcVA!QWa$AcE$~6Jr4i|mw;=oNIm8>5;C`JR zW}6wGT0i2@voxH2m4(vg5^zQ_5{n~{SCtKmxdX~aiRkF;z=!XZh|~w+blDL|4SeKO zUIeEVqrqH(G6gBaZYkc(3<58_PO3E1pbND2g~X|0A-?+dn2h$ur4?$z8xW=R^jA~E$5 z0ISW4>Tgw$>G%jM5+cqRiiBboD@+{hb_eVZJKAmSXt$ctVrfE?sRzlIxCSCCtE8P_T^4}5 zX9saGQ%@3_kEDPPDcvv83Q%vZrCdO7QPc^DqX4xur&{WXEfkR+La;g!!t_FL#DgPE zI0Hq}w!Gy9%1DWj6}(J%^@;m z3YlxfJQs#pki73V5We3p(8;*}ghUOGr%712)LGF9uYjrJ_Ri;zRCd=4voUtrz%BBw I>Tf6b3o`IY8vp -
-
-
- - - - - - Tracksapp -
-
    -
  • <%= link_to "Link1", "/path1" %>
    • -
  • <%= link_to "Link2", "/path2" %>
    • -
  • <%= link_to "Link3", "/path3" %>
    • -
-
-
-
-
+ <%= render partial: "shared/navbar" %>
-
-
-
    -
  • Sidebar
    • -
  • <%= link_to "Link1", "/path1" %>
    • -
  • <%= link_to "Link2", "/path2" %>
    • -
  • <%= link_to "Link3", "/path3" %>
    • -
-
-
-
+
<%= bootstrap_flash %> <%= yield %>
-
+
+
-
-

© Company 2013

-
+ <%= render partial: "shared/footer" %> - - - - + <% + # Javascripts + # ================================================== + # Placed at the end of the document so the pages load faster + -%> <%= javascript_include_tag "application" %> diff --git a/app/views/layouts/login.html.erb b/app/views/layouts/login.html.erb index 0a04e3c6..db0b0b84 100644 --- a/app/views/layouts/login.html.erb +++ b/app/views/layouts/login.html.erb @@ -36,7 +36,7 @@ -
+