base.html.erb in knitkit-3.2.0

- old
+ new
@@ -7,77 +7,80 @@
 
   <title><%= @website.title %></title>
 
   <%= javascript_include_tag :application %>
 
-  <!-- bootstrap -->
-  <%= static_javascript_include_tag 'knitkit/bootstrap.min.js' %>
-  <%= static_javascript_include_tag 'knitkit/theme.js' %>
-  <%= static_javascript_include_tag 'knitkit/bootstrap-datepicker.js' %>
-  <%= static_javascript_include_tag 'knitkit/confirm-bootstrap.js' %>
+  <%= javascript_include_tag 'erp_app/utility' %>
+  <%= javascript_include_tag 'erp_app/jquery_support' %>
+  <%= javascript_include_tag 'erp_app/widgets' %>
 
-  <%= static_stylesheet_link_tag 'knitkit/bootstrap.min.css' %>
-  <%= static_stylesheet_link_tag 'knitkit/bootstrap-responsive.min.css' %>
-  <%= static_stylesheet_link_tag 'knitkit/datepicker.css' %>
-  <%= static_stylesheet_link_tag 'knitkit/custom.css' %>
-  <!-- end bootstrap -->
+  <!-- Knitkit Helpers -->
+  <%= javascript_include_tag 'knitkit-web' %>
+  <%= stylesheet_link_tag 'knitkit-web' %>
+  <!-- end -->
 
-  <%= static_javascript_include_tag 'erp_app/utility.js' %>
-  <%= static_javascript_include_tag 'erp_app/jquery_support.js' %>
-  <%= static_javascript_include_tag 'erp_app/widgets.js' %>
-  <%= static_javascript_include_tag 'knitkit/inline_editing.js' %>
-  <%= static_javascript_include_tag 'knitkit/jquery.maskedinput.min.js' %>
+  <!-- Bootstrap theme helpers -->
+  <%= javascript_include_tag 'knitkit/theme' %>
+  <%= stylesheet_link_tag 'knitkit/custom' %>
+  <!-- end -->
 
+  <!-- code mirror -->
   <%= include_code_mirror_library %>
-  <%= static_stylesheet_link_tag 'knitkit/inline_editing.css' %>
 
   <%= setup_js_authentication %>
 
   <%= yield :head %>
 </head>
 <body>
 
-<div id="wrap">
+  <div id="wrap">
 
-  <nav class="navbar navbar-inverse navbar-fixed-top" role="navigation">
-    <div class="navbar-header pull-left">
-      <a class="navbar-brand" href="/home"><img src="/images/knitkit/logo.png" alt="Logo"/></a>
-    </div>
+    <nav class="navbar navbar-inverse navbar-fixed-top" role="navigation">
+      <div class="navbar-header pull-left">
+        <a class="navbar-brand" href="/home"><img src="/assets/knitkit/logo.png" alt="Logo"/></a>
+      </div>
 
-    <div class="navbar-header pull-right">
-      <button type="button" class="navbar-toggle" data-toggle="collapse" data-target=".navbar-collapse">
-        <span class="icon-bar"></span>
-        <span class="icon-bar"></span>
-        <span class="icon-bar"></span>
-      </button>
-    </div>
+      <div class="navbar-header pull-right">
+        <button type="button" class="navbar-toggle" data-toggle="collapse" data-target=".navbar-collapse">
+          <span class="icon-bar"></span>
+          <span class="icon-bar"></span>
+          <span class="icon-bar"></span>
+        </button>
+      </div>
 
-    <%= render_widget :login,
-                      :action => :login_header,
-                      :params => {:login_url => '/login', :signup_url => '/sign-up'} %>
+      <%= render_widget :search,
+      :action => :index,
+      :params => {:redirect_results => true, :results_permalink => '/search-results'} %>
 
-    <div class="container">
-      <div class="navbar-collapse collapse">
-        <ul class="nav navbar-nav">
-          <%= content_for?(:menu) ? yield(:menu) : render_menu(@contents) %>
-        </ul>
+
+      <%= render_widget :login,
+      :action => :login_header,
+      :params => {:login_url => '/login', :signup_url => '/sign-up'} %>
+
+      <div class="container-fluid">
+        <div class="navbar-collapse collapse">
+          <ul class="nav navbar-nav">
+            <%= content_for?(:menu) ? yield(:menu) : render_menu(@contents) %>
+          </ul>
+        </div>
       </div>
+
+    </nav>
+
+    <div class="content-area">
+      <%= content_for?(:sub_menu) ? yield(:sub_menu) : render_sub_menu(@contents) %>  
+
+      <%= yield %>
     </div>
-  </nav>
 
-  <!-- Wrap all page content here -->
+  </div>
 
-  <div class="content-area">
-    <%= yield %>
+  <div class="footer">
+    <%= content_for?(:footer) ? yield(:footer) : (render :partial => 'shared/knitkit/footer') %>
+    <%= yield :foot %>
   </div>
+  <%= set_authenticity_token %>
+  <%= set_session_timeout %>
+  <%= setup_inline_editing %>
 
-</div>
-
-<div class="footer">
-  <%= content_for?(:footer) ? yield(:footer) : (render :partial => 'shared/knitkit/footer') %>
-  <%= yield :foot %>
-</div>
-<%= set_authenticity_token %>
-<%= set_session_timeout %>
-<%= setup_inline_editing %>
 </body>
 </html>
\ No newline at end of file