Split main layout
authorVincent Tondellier <tonton+hg@team1664.org>
Mon, 28 Dec 2015 21:34:08 +0100
changeset 82 f15cbfb7a8e5
parent 81 29e378724e62
child 83 eaf6d0ea4e65
Split main layout
templates/layouts/_messages.html.ep
templates/layouts/_navbar.html.ep
templates/layouts/main.html.ep
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/templates/layouts/_messages.html.ep	Mon Dec 28 21:34:08 2015 +0100
@@ -0,0 +1,41 @@
+% content_for 'success_messages' => begin
+ % if ( defined($self->session->{success_messages}) && ( scalar( @{ $self->session->{success_messages}} ) > 0 ) ){
+  %foreach my $notice ( @{ $self->session->{success_messages}} ){
+   <div class="alert alert-success">
+    <a class="close" data-dismiss="alert">×</a>
+    <p><%= $notice; %></p>
+   </div>
+  %}
+  %delete($self->session->{success_messages});
+ %}
+%end
+
+% content_for 'noticed_messages' => begin
+ % if ( defined($self->session->{notice_messages}) && ( scalar( @{ $self->session->{notice_messages}} ) > 0 ) ){
+  %foreach my $notice ( @{ $self->session->{notice_messages}} ){
+   <div class="alert alert-info">
+    <a class="close" data-dismiss="alert">×</a>
+    <p><%= $notice; %></p>
+   </div>
+  %}
+  %delete($self->session->{notice_messages});
+ %}
+%end
+
+% content_for 'error_messages' => begin
+ % if ( defined($self->session->{error_messages}) && ( scalar( @{ $self->session->{error_messages}} ) > 0 ) ){
+  <div id="error-messages" class="error-messages">
+   %foreach my $error ( @{ $self->session->{error_messages}} ){
+    <div class="alert alert-error">
+     <a class="close" data-dismiss="alert">×</a>
+     <p><%= $error; %></p>
+    </div>
+   %}
+   %delete($self->session->{error_messages});
+  </div>
+ %}
+%end
+
+<%= content_for 'error_messages' %>
+<%= content_for 'noticed_messages' %>
+<%= content_for 'success_messages' %>
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/templates/layouts/_navbar.html.ep	Mon Dec 28 21:34:08 2015 +0100
@@ -0,0 +1,37 @@
+<nav class="navbar navbar-default navbar-fixed-top" role="navigation">
+  <div class="container-fluid">
+    <div class="navbar-header">
+      <button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target="#navbar-collapse" aria-expanded="false">
+        <span class="sr-only">Toggle navigation</span>
+        <span class="icon-bar"></span>
+        <span class="icon-bar"></span>
+        <span class="icon-bar"></span>
+      </button>
+      %= link_to url_for('index') => (class => 'navbar-brand') => begin
+        <span class="glyphicon glyphicon-home"></span>
+        Crashs
+      % end
+    </div>
+    <div class="collapse navbar-collapse" id="navbar-collapse">
+      <ul class="nav navbar-nav">
+        %=t li => (class => current_route('groups') ? "active" : "") => begin
+          %= link_to 'Groups' => url_for('groups')
+        % end
+        %=t li => (class => current_route('reports') ? "active" : "") => begin
+          %= link_to 'Reports' => url_for('reports')
+        % end
+      </ul>
+
+      % if(current_route('groups') || current_route('reports')) {
+      <form id="search-box" class="navbar-form navbar-right" method="get" action="<%= url_for("current") %>" role="search">
+        <div class="input-group">
+          <input name="search" type="text" style="width:400px;" class="form-control" placeholder="Search" value="<%= param("search") %>">
+          <span class="input-group-btn">
+            <button class="btn btn-default" type="submit"><span class="glyphicon glyphicon-search"></span></button>
+          </span>
+        </div>
+      </form>
+      % }
+    </div>
+  </div>
+</nav>
--- a/templates/layouts/main.html.ep	Sat Dec 12 15:58:05 2015 +0100
+++ b/templates/layouts/main.html.ep	Mon Dec 28 21:34:08 2015 +0100
@@ -8,80 +8,18 @@
 
     % if ( $self->app->mode eq 'development'){
     %= stylesheet '/assets/css/bootstrap.css'
-    %= stylesheet '/assets/css/bootstrap-theme.css'
     %} else {
     %= stylesheet '/assets/css/bootstrap.min.css'
-    %= stylesheet '/assets/css/bootstrap-theme.min.css'
     %}
-    %= stylesheet begin
-      body {
-        padding-top: 60px;
-      }
-      code.prettyprint {
-        background-color: transparent;
-      }
-    % end
-    <link href="/mojo/prettify/prettify-mojo-light.css" type="text/css" rel="stylesheet" />
+    %= stylesheet '/mojo/prettify/prettify-mojo-dark.css'
+    %= stylesheet '/assets/css/application.css'
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
   </head>
 
   <body>
-    <div class="navbar navbar-inverse navbar-fixed-top" role="navigation">
-      <div class="container-fluid">
-          %= link_to 'Crash test' => url_for('index') => (class => 'navbar-brand')
-          <form id="search-box" class="navbar-form navbar-right" method="get" action="<%= url_for("index") %>" role="search">
-            <div class="input-group">
-              <input name="search" type="text" style="width:400px;" class="form-control" placeholder="Search" value="<%= param("search") %>">
-              <span class="input-group-btn">
-                <button class="btn btn-default" type="submit">Go!</button>
-              </span>
-            </div>
-          </form>
-      </div>
-    </div>
+    %= include("layouts/_navbar")
     <div class="container-fluid">
-      % content_for 'success_messages' => begin
-       % if ( defined($self->session->{success_messages}) && ( scalar( @{ $self->session->{success_messages}} ) > 0 ) ){
-        %foreach my $notice ( @{ $self->session->{success_messages}} ){
-         <div class="alert alert-success">
-          <a class="close" data-dismiss="alert">×</a>
-          <p><%= $notice; %></p>
-         </div>
-        %}
-        %delete($self->session->{success_messages});
-       %}
-      %end
-
-      % content_for 'noticed_messages' => begin
-       % if ( defined($self->session->{notice_messages}) && ( scalar( @{ $self->session->{notice_messages}} ) > 0 ) ){
-        %foreach my $notice ( @{ $self->session->{notice_messages}} ){
-         <div class="alert alert-info">
-          <a class="close" data-dismiss="alert">×</a>
-          <p><%= $notice; %></p>
-         </div>
-        %}
-        %delete($self->session->{notice_messages});
-       %}
-      %end
-
-      % content_for 'error_messages' => begin
-       % if ( defined($self->session->{error_messages}) && ( scalar( @{ $self->session->{error_messages}} ) > 0 ) ){
-        <div id="error-messages" class="error-messages">
-         %foreach my $error ( @{ $self->session->{error_messages}} ){
-          <div class="alert alert-error">
-           <a class="close" data-dismiss="alert">×</a>
-           <p><%= $error; %></p>
-          </div>
-         %}
-         %delete($self->session->{error_messages});
-        </div>
-       %}
-      %end
-
       <%= content_for 'hero_unit' %>
-      <%= content_for 'error_messages' %>
-      <%= content_for 'noticed_messages' %>
-      <%= content_for 'success_messages' %>
 
       <%= content %>
     </div>