RubyGems - knitkit - Versions diffs - 2.1.15 → 3.0.0 - Mend

knitkit 2.1.15 → 3.0.0

Files changed (209) hide show

data/app/views/knitkit/online_document_sections/index.html.erb CHANGED

@@ -1,4 +1,6 @@
-<div id="document_content">
+<div style="margin-top:10px;" class="container">
+  <div id="document_content">
+  </div>
 </div>
 <script type="text/javascript" charset="utf-8">
@@ -104,7 +106,7 @@
         footer_height = Ext.get("footer").getHeight();
         document_content_height = window_height - header_height - footer_height;
         Ext.get("document_content").setHeight(document_content_height);
-        Ext.getCmp("fittedPanelDiv").setHeight(document_content_height - 20);
+        Ext.getCmp("fittedPanelDiv").setHeight(document_content_height);
     }
     Ext.onReady(function () {
@@ -210,10 +212,9 @@
         Ext.createWidget('panel', {
             id: 'fittedPanelDiv',
             layout: 'border',
-            width: 800,
+            //width: 800,
             header: false,
             defaults: {
-                collapsible: true,
                 split: true
             },
             renderTo: 'document_content',
@@ -229,7 +230,7 @@
         Ext.Ajax.request({
             url: '/online_document_sections/get_content',
             params: {
-                document_section_id:'<%= @root.internal_identifier %>',
+                document_section_id: '<%= @root.internal_identifier %>',
                 section_id:<%= @root.id %>
             },
             success: function (response) {
@@ -243,6 +244,7 @@
                     });
                     tabPanel.add(panel).show();
+                    tabPanel.setActiveTab(panel);
                 }
                 else {
                     Ext.Msg.alert('Error', 'Could not load content');

data/app/views/knitkit/unauthorized/index.html.erb CHANGED

@@ -1,4 +1,8 @@
-<h1 style="color:red;">Unauthorized Access</h1>
-<p>
-  You are not allowed to access this section
-</p>
+<div class="container">
+  <div class="page-header">
+    <h1 style="color:red;">Unauthorized Access</h1>
+  </div>
+  <p>
+    You are not allowed to access this section
+  </p>
+</div>

data/app/views/knitkit/website_sections/index.html.erb CHANGED

@@ -1,5 +1,9 @@
-<h2><%=h @website_section.title %></h2>
+<div class="container">
+  <div class="page-header">
+    <h1><%= @website_section.title %></h1>
+  </div>
-<% @contents.each do |content| %>
-    <%= render_editable_content(content) %>
-<% end %>
+  <% @contents.each do |content| %>
+      <%= render_editable_content(content) %>
+  <% end %>
+</div>

data/app/views/layouts/knitkit/base.html.erb CHANGED

@@ -1,67 +1,83 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml2/DTD/xhtml1-strict.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
-  <head>
-    <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
-    <meta name="generator" content="Knitkit - Compass AE Open source content management platform" />
-    <meta name="description" content="" />
-    <meta name="keywords" content="" />
-    <meta name="copyright" content="&copy;" />
-    <meta name="robots" content="ALL" />
-    <meta name="language" content="English" />
-    <title><%= @website.title %></title>
-    <%= javascript_include_tag :application %>
-    <%= include_extjs %>
-    <%= static_javascript_include_tag('erp_app/utility.js') %>
-    <%= set_erp_tech_config_vars %>
-    <%= static_javascript_include_tag('erp_app/jquery_support.js') %>
-    <%= static_javascript_include_tag('datepicker.js') %>
-    <%= static_stylesheet_link_tag('datepicker.css') %>
-    <%= static_stylesheet_link_tag('extjs/resources/css/knitkit_extjs_4.css') %>
-    <%= static_stylesheet_link_tag('knitkit/style.css') %>
-    <%= static_stylesheet_link_tag('knitkit/inline_editing.css') %>
-    <%= static_javascript_include_tag('erp_app/widgets.js') %>
-    <%= static_javascript_include_tag('ajax_pagination.js') %>
-    <%= static_javascript_include_tag('erp_app/shared/dynamic_forms/dynamic_forms_validation.js') %>
-    <%= static_javascript_include_tag('knitkit/helpers.js') %>
-    <%= static_javascript_include_tag('knitkit/inline_editing.js') %>
-    <%= static_javascript_include_tag('erp_app/ckeditor/ckeditor.js') %>
-    <%= yield :head %>
-  </head>
-  <body>
-    <div id="main">
-      <div id="header">
-        <div id="logo">
-          <%=render_version_viewing%>
-          <%= render_widget :login,
-                            :action => :login_header,
-                            :params => {:login_url => '/login',
-                            :signup_url => '/sign-up'}%>
-          <div id="logo_text">
-            <!-- class="logo_color", allows you to change the color of the text -->
-            <h1><a href="/"><%= @website.title %></a></h1>
-            <h2><%= @website.subtitle %></h2>
-          </div>
-        </div>
-        <%= content_for?(:menu) ? yield(:menu) : render_menu(@contents) %>
-        <%#=render_menu(@contents, :menu => 'main')%>
-      </div>
-      <div id="site_content">
-      <%=build_crumbs %>
-      <br/>
-      <%= content_for?(:sub_menu) ? yield(:sub_menu) : render_sub_menu(@contents) %>
-      <%#=render_sub_menu(@contents, :menu => 'main')%>
-        <div id="content">
-          <%= yield %>
-        </div>
+<head>
+  <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
+  <meta name="viewport" content="width=device-width, initial-scale=1.0">
+  <meta name="generator" content="Knitkit - Compass AE Open source content management platform"/>
+  <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' %>
+  <%= 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 -->
+  <%= 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' %>
+  <%= include_code_mirror_library %>
+  <%= static_stylesheet_link_tag 'knitkit/inline_editing.css' %>
+  <%= setup_js_authentication %>
+  <%= yield :head %>
+</head>
+<body>
+<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>
+    <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'} %>
+    <div class="container">
+      <div class="navbar-collapse collapse">
+        <ul class="nav navbar-nav">
+          <%= content_for?(:menu) ? yield(:menu) : render_menu(@contents) %>
+        </ul>
       </div>
-      <div id="content_footer"></div>
-      <%= content_for?(:footer) ? yield(:footer) : (render :partial => 'shared/knitkit/footer') %>
-      <%= yield :foot %>
     </div>
-    <%= setSessionTimeout %>
-    <%= setup_inline_editing %>
-  </body>
-</html>
+  </nav>
+  <!-- Wrap all page content here -->
+  <div class="content-area">
+    <%= yield %>
+  </div>
+</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>

data/app/views/layouts/knitkit/online_document_sections.html.erb CHANGED

@@ -1,58 +1,80 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml2/DTD/xhtml1-strict.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
-  <head>
-    <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
-    <meta name="generator" content="Knitkit - Compass AE Open source content management platform" />
-    <meta name="description" content="" />
-    <meta name="keywords" content="" />
-    <meta name="copyright" content="&copy;" />
-    <meta name="robots" content="ALL" />
-    <meta name="language" content="English" />
-    <title><%= @website.title %></title>
-    <%= javascript_include_tag :application %>
-    <%= include_extjs :theme => 'extjs:ext-all-gray' %>
-    <%= set_erp_tech_config_vars %>
-    <%= static_javascript_include_tag('erp_app/utility.js') %>
-    <%= static_javascript_include_tag('erp_app/jquery_support.js') %>
-    <%= static_javascript_include_tag('datepicker.js') %>
-    <%= static_stylesheet_link_tag('datepicker.css') %>
-    <%= static_stylesheet_link_tag('extjs/resources/css/knitkit_extjs_4.css') %>
-    <%= static_stylesheet_link_tag('erp_app/shared/compass-ext-all.css') %>
-    <%= static_stylesheet_link_tag('knitkit/style.css') %>
-    <%= static_javascript_include_tag('erp_app/widgets.js') %>
-    <%= yield :head %>
-  </head>
-  <body>
-    <div id="main">
-      <div id="header">
-        <div id="logo">
-          <%=render_version_viewing%>
-          <%= render_widget :login,
-                            :action => :login_header,
-                            :params => {:login_url => '/login',
-                            :signup_url => '/sign-up'}%>
-          <div id="logo_text">
-            <!-- class="logo_color", allows you to change the color of the text -->
-            <h1><a href="/"><%= @website.title %></a></h1>
-            <h2><%= @website.subtitle %></h2>
-          </div>
-        </div>
-        <%= content_for?(:menu) ? yield(:menu) : render_menu(@contents) %>
-        <%#=render_menu(@contents, :menu => 'main')%>
-      </div>
-      <div id="site_content">
-        <br/>
-        <div id="content">
-          <%= yield %>
-        </div>
+<head>
+  <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
+  <meta name="generator" content="Knitkit - Compass AE Open source content management platform"/>
+  <meta name="description" content=""/>
+  <meta name="keywords" content=""/>
+  <meta name="copyright" content="&copy;"/>
+  <meta name="robots" content="ALL"/>
+  <meta name="language" content="English"/>
+  <title><%= @website.title %></title>
+  <%= javascript_include_tag :application %>
+  <%= include_extjs :theme => 'extjs:ext-all-gray' %>
+  <!-- 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' %>
+  <%= static_stylesheet_link_tag 'knitkit/bootstrap.min.css' %>
+  <%= static_stylesheet_link_tag 'knitkit/bootstrap-responsive.min.css' %>
+  <%= static_stylesheet_link_tag 'knitkit/custom.css' %>
+  <%= static_stylesheet_link_tag 'knitkit/datepicker.css' %>
+  <!-- end bootstrap -->
+  <%= 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') %>
+</head>
+<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>
+    <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'} %>
+    <div class="container" id="header">
+      <div class="navbar-collapse collapse">
+        <ul class="nav navbar-nav">
+          <%= content_for?(:menu) ? yield(:menu) : render_menu(@contents) %>
+        </ul>
       </div>
     </div>
-		<div id="content_footer"></div>
-    <%= content_for?(:footer) ? yield(:footer) : (render :partial => 'shared/knitkit/footer') %>
-    <%= yield :foot %>
-  </body>
+  </nav>
+  <!-- Wrap all page content here -->
+  <div class="content-area">
+    <%= yield %>
+  </div>
+</div>
+<div id="footer" class="footer">
+  <%= content_for?(:footer) ? yield(:footer) : (render :partial => 'shared/knitkit/footer') %>
+  <%= yield :foot %>
+</div>
+</body>
 </html>

data/app/views/menus/knitkit/_default_menu.html.erb CHANGED

@@ -1,15 +1,15 @@
-<div id="menubar">
-  <ul id="menu">
+<div class="collapse navbar-collapse" id="bs-example-navbar-collapse-1">
+  <ul class="nav navbar-nav">
    <% selected_menu_item = nil
       menu_items.each do |menu_item|
-        if menu_item.allow_access?(@current_user, :view)
+        if menu_item.allow_access?(current_user, :view)
         if menu_item_selected(menu_item)
           selected_menu_item = menu_item %>
         <li class="selected">
         <% else %>
         <li>
         <% end %>
-        <a href="<%= menu_item.path %>"><span><%= menu_item.title %></span></a>
+        <a href="<%= menu_item.path %>"><%= menu_item.title %></a>
       </li>
     <% end %>
   <% end %>

data/app/views/menus/knitkit/_default_section_menu.html.erb CHANGED

@@ -1,27 +1,26 @@
-<div id="menubar">
-<%
-  selected_section_parent = @website_section.nil? ? nil : @website_section.parent
-%>
+<div class="collapse navbar-collapse" id="bs-example-navbar-collapse-1">
+  <%
+     selected_section_parent = @website_section.nil? ? nil : @website_section.parent
+  %>
   <% unless @website_sections.nil? %>
-    <ul id="menu">
-      <% @website_sections.each do |section|
-          if section.in_menu
-            if section.allow_access?(@current_user, :view)
+      <ul class="nav navbar-nav">
+        <% @website_sections.each do |section|
+          if section.display_in_menu?
+            if section.allow_access?(current_user, :view)
               if (!@website_section.nil? && section.id == @website_section.id) or (!selected_section_parent.nil? and selected_section_parent.id == section.id) %>
-                <li class="selected">
-                <%
-                selected_section_parent = section
-              else
-              %>
-              <li>
-              <%end%>
-              <a href="<%= section.path %>"><span><%= section.title %></span></a>
-            </li>
-          <%end%>
+                        <li class="active">
+                    <%
+                       selected_section_parent = section
+                       else
+                    %>
+                        <li>
+                    <% end %>
+                    <a href="<%= section.path %>"><%= section.title %></a>
+                    </li>
+                <% end %>
+            <% end %>
         <% end %>
-      <% end %>
-    </ul>
-  </div>
-  <br/>
-<% end %>
+      </ul>
+      </div>
+  <% end %>

data/app/views/shared/knitkit/_bread_crumb.html.erb CHANGED

@@ -1,7 +1,10 @@
-<% links.each do |link| %>
-<% unless link[:title] == links.first[:title]%>
->
-<%end %>
-<a href="<%= link[:url] %>"><%=link[:title]%></a>
-<%  end %>
-<br/>
+<ol class="breadcrumb">
+  <% links.each do |link| %>
+      <% if link[:title] == links.last[:title] %>
+          <li class="active"><%= link[:title] %></li>
+      <% else %>
+          <li><a href="<%= link[:url] %>"><%= link[:title] %></a></li>
+      <% end %>
+  <% end %>
+  <br/>
+</ol>

data/app/views/shared/knitkit/_footer.html.erb CHANGED

@@ -1,3 +1,3 @@
-<div id="footer">
-Powered By <a href="http://development.compassagile.com">CompassAE</a>
+<div class="container">
+  <p class="text-muted text-center credit">Powered by: <a href="http://compassagile.com">CompassAE</a></p>
 </div>