optimacms 0.2.8 → 0.2.9

data/spec/dummy/app/assets/stylesheets/bootstrap_custom.css.scss

@@ -1,50 +1,50 @@
-// Core variables and mixins
-@import "bootstrap/variables";
-@import "bootstrap/mixins";
-
-// Reset and dependencies
-@import "bootstrap/normalize";
-@import "bootstrap/print";
-@import "bootstrap/glyphicons";
-
-// Core CSS
-@import "bootstrap/scaffolding";
-@import "bootstrap/type";
-@import "bootstrap/code";
-@import "bootstrap/grid";
-@import "bootstrap/tables";
-@import "bootstrap/forms";
-@import "bootstrap/buttons";
-
-// Components
-//@import "bootstrap/component-animations";
-@import "bootstrap/dropdowns";
-@import "bootstrap/button-groups";
-@import "bootstrap/input-groups";
-@import "bootstrap/navs";
-@import "bootstrap/navbar";
-@import "bootstrap/breadcrumbs";
-@import "bootstrap/pagination";
-@import "bootstrap/pager";
-@import "bootstrap/labels";
-@import "bootstrap/badges";
-@import "bootstrap/jumbotron";
-//@import "bootstrap/thumbnails";
-@import "bootstrap/alerts";
-//@import "bootstrap/progress-bars";
-@import "bootstrap/media";
-@import "bootstrap/list-group";
-@import "bootstrap/panels";
-@import "bootstrap/responsive-embed";
-@import "bootstrap/wells";
-@import "bootstrap/close";
-
-// Components w/ JavaScript
-@import "bootstrap/modals";
-@import "bootstrap/tooltip";
-//@import "bootstrap/popovers";
-//@import "bootstrap/carousel";
-
-// Utility classes
-@import "bootstrap/utilities";
+// Core variables and mixins
+@import "bootstrap/variables";
+@import "bootstrap/mixins";
+
+// Reset and dependencies
+@import "bootstrap/normalize";
+@import "bootstrap/print";
+@import "bootstrap/glyphicons";
+
+// Core CSS
+@import "bootstrap/scaffolding";
+@import "bootstrap/type";
+@import "bootstrap/code";
+@import "bootstrap/grid";
+@import "bootstrap/tables";
+@import "bootstrap/forms";
+@import "bootstrap/buttons";
+
+// Components
+//@import "bootstrap/component-animations";
+@import "bootstrap/dropdowns";
+@import "bootstrap/button-groups";
+@import "bootstrap/input-groups";
+@import "bootstrap/navs";
+@import "bootstrap/navbar";
+@import "bootstrap/breadcrumbs";
+@import "bootstrap/pagination";
+@import "bootstrap/pager";
+@import "bootstrap/labels";
+@import "bootstrap/badges";
+@import "bootstrap/jumbotron";
+//@import "bootstrap/thumbnails";
+@import "bootstrap/alerts";
+//@import "bootstrap/progress-bars";
+@import "bootstrap/media";
+@import "bootstrap/list-group";
+@import "bootstrap/panels";
+@import "bootstrap/responsive-embed";
+@import "bootstrap/wells";
+@import "bootstrap/close";
+
+// Components w/ JavaScript
+@import "bootstrap/modals";
+@import "bootstrap/tooltip";
+//@import "bootstrap/popovers";
+//@import "bootstrap/carousel";
+
+// Utility classes
+@import "bootstrap/utilities";
 @import "bootstrap/responsive-utilities";

data/spec/dummy/app/assets/stylesheets/tpl.css.scss

@@ -1,63 +1,63 @@
-/* Sticky footer styles -------------------------------------------------- */
-
-html,
-body {
-  height: 100%;
-  /* The html and body elements cannot have any padding or margin. */
-}
-
-/* Wrapper for page content to push down footer */
-#wrap {
-  min-height: 100%;
-  height: auto !important;
-  height: 100%;
-
-  /* Negative indent footer by its height */
-  margin: 0 auto -60px;
-  /* Pad bottom by footer height */
-  padding: 0 0 60px;
-}
-
-
-#footer {
-  height: 60px;
-  background-color: #f5f5f5;
-}
-
-
-
-#wrap > .container {
-  padding: 60px 15px 0;
-}
-
-#footer > .container {
-  padding-left: 15px;
-  padding-right: 15px;
-}
-
-
-
-/* page header */
-
-.pageheader{
-  h1{
-    margin-top: 0px;
-  }
-}
-
-/* common */
-
-.help{
-  color: #999999;
-  font-size: 80%;
-}
-
-
-a.link-gray{
-  color: #333333;
-  text-decoration: underline;
-
-  &:hover{
-    text-decoration: none;
-  }
+/* Sticky footer styles -------------------------------------------------- */
+
+html,
+body {
+  height: 100%;
+  /* The html and body elements cannot have any padding or margin. */
+}
+
+/* Wrapper for page content to push down footer */
+#wrap {
+  min-height: 100%;
+  height: auto !important;
+  height: 100%;
+
+  /* Negative indent footer by its height */
+  margin: 0 auto -60px;
+  /* Pad bottom by footer height */
+  padding: 0 0 60px;
+}
+
+
+#footer {
+  height: 60px;
+  background-color: #f5f5f5;
+}
+
+
+
+#wrap > .container {
+  padding: 60px 15px 0;
+}
+
+#footer > .container {
+  padding-left: 15px;
+  padding-right: 15px;
+}
+
+
+
+/* page header */
+
+.pageheader{
+  h1{
+    margin-top: 0px;
+  }
+}
+
+/* common */
+
+.help{
+  color: #999999;
+  font-size: 80%;
+}
+
+
+a.link-gray{
+  color: #333333;
+  text-decoration: underline;
+
+  &:hover{
+    text-decoration: none;
+  }
 }

data/spec/dummy/app/controllers/home_controller.rb

@@ -1,6 +1,6 @@
-class HomeController < ApplicationController
-
-  def index
-
-  end
-end
+class HomeController < ApplicationController
+
+  def index
+
+  end
+end

data/spec/dummy/app/controllers/my_controller.rb

@@ -1,6 +1,6 @@
-class MyController < ApplicationController
-
-  def hello
-
-  end
-end
+class MyController < ApplicationController
+
+  def hello
+
+  end
+end

data/spec/dummy/app/controllers/news_controller.rb

@@ -1,48 +1,48 @@
-class NewsController < ApplicationController
-
-  before_action :set_page, only: [:index, :index_page]
-
-  def index
-
-    x = params[:pg]
-
-    @items = News.all
-
-
-  end
-
-  def show
-    @item = News.find params['id']
-  end
-
-  def index_page(tpl_filename=nil)
-
-    @items = News.all
-
-    @v_news = 9
-
-    #@template = 'pages/news2.html.erb'
-    #render nothing: true
-    #(render template: tpl_filename) unless tpl_filename.nil?
-    #my_render
-
-    #render 'pages/news2.html'
-    #render template: 'pages/news2.html.erb', locals: {pg: 4}
-
-  end
-
-
-  def default_render11(*args)
-    #render 'pages/news2.html.erb'
-    unless @optimacms_tpl.nil?
-      render @optimacms_tpl and return
-    end
-
-    super
-  end
-
-  def set_page
-    @pg = params[:pg] || 1
-  end
-
-end
+class NewsController < ApplicationController
+
+  before_action :set_page, only: [:index, :index_page]
+
+  def index
+
+    x = params[:pg]
+
+    @items = News.all
+
+
+  end
+
+  def show
+    @item = News.find params['id']
+  end
+
+  def index_page(tpl_filename=nil)
+
+    @items = News.all
+
+    @v_news = 9
+
+    #@template = 'pages/news2.html.erb'
+    #render nothing: true
+    #(render template: tpl_filename) unless tpl_filename.nil?
+    #my_render
+
+    #render 'pages/news2.html'
+    #render template: 'pages/news2.html.erb', locals: {pg: 4}
+
+  end
+
+
+  def default_render11(*args)
+    #render 'pages/news2.html.erb'
+    unless @optimacms_tpl.nil?
+      render @optimacms_tpl and return
+    end
+
+    super
+  end
+
+  def set_page
+    @pg = params[:pg] || 1
+  end
+
+end

data/spec/dummy/app/models/news.rb

@@ -1,7 +1,7 @@
-class News< ActiveRecord::Base
-  self.table_name ='news'
-
-  #
-  searchable_by_simple_filter
-
-end
+class News< ActiveRecord::Base
+  self.table_name ='news'
+
+  #
+  searchable_by_simple_filter
+
+end

data/spec/dummy/app/views/company/p3.en.html.haml

@@ -0,0 +1 @@
+англ

data/spec/dummy/app/views/company/p3.ru.html.haml

@@ -0,0 +1 @@
+рус

data/spec/dummy/app/views/home/index.html.haml

@@ -1,19 +1,19 @@
-%h2 Admin
-%ul
-  %li= link_to 'admin area', '/'+Optimacms.main_namespace+'/'+Optimacms.admin_namespace
-
-%h2 Users
-%ul
-  %li= link_to 'Login', new_user_session_path
-
-%h2 Pages
-
-%ul
-  %li= link_to '/about.html', '/about.html'
-  %li= link_to '/text1.html', '/text1.html'
-  %li= link_to '/news.html', '/news.html'
-  %li= link_to '/news-p2.html', '/news-p2.html'
-  %li= link_to '/newsitem-1.html', '/newsitem-1.html'
-  %li= link_to '/services.html', '/services.html'
-  %li= link_to '/service-education.html', '/service-education.html'
-  %li= link_to '/service-hosting.html', '/service-hosting.html'
+%h2 Admin
+%ul
+  %li= link_to 'admin area', '/'+Optimacms.main_namespace+'/'+Optimacms.admin_namespace
+
+%h2 Users
+%ul
+  %li= link_to 'Login', new_user_session_path
+
+%h2 Pages
+
+%ul
+  %li= link_to '/about.html', '/about.html'
+  %li= link_to '/text1.html', '/text1.html'
+  %li= link_to '/news.html', '/news.html'
+  %li= link_to '/news-p2.html', '/news-p2.html'
+  %li= link_to '/newsitem-1.html', '/newsitem-1.html'
+  %li= link_to '/services.html', '/services.html'
+  %li= link_to '/service-education.html', '/service-education.html'
+  %li= link_to '/service-hosting.html', '/service-hosting.html'

data/spec/dummy/app/views/layouts/application.html.erb

@@ -6,8 +6,11 @@
   <%= csrf_meta_tags %>
 </head>
 <body>
+
 Application layout:
+
 <%= yield %>
 
 </body>
 </html>
+

data/spec/dummy/app/views/layouts/layout1.html.haml

@@ -0,0 +1 @@
+111111

data/spec/dummy/app/views/layouts/layout2.html.haml

@@ -0,0 +1 @@
+111

data/spec/dummy/app/views/layouts/main.html.haml

@@ -1,13 +1,40 @@
-!!!
-%html
-  %head
-    = meta_tags
-    = stylesheet_link_tag    'application', media: 'all'
-    = stylesheet_link_tag    'tpl', media: 'all'
-    = javascript_include_tag 'application'
-    = csrf_meta_tags
-  %body
-    layout 'main':
-
-    =yield
-
+!!! Strict
+
+%html
+
+  %head
+
+    = meta_tags
+
+
+
+    <meta http-equiv="content-type" content="text/html; charset=UTF-8" />
+
+    <meta http-equiv="X-UA-Compatible" content="IE=edge">
+
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+
+
+
+    = stylesheet_link_tag    "application", media: "all"
+
+    
+
+    = javascript_include_tag :application
+
+    
+
+    = csrf_meta_tag
+
+
+
+    = yield(:head)
+
+
+
+  %body
+
+    = content_for?(:content) ? yield(:content) : yield
+
+
+

data/spec/dummy/app/views/my/hello.html.haml

@@ -1,5 +1,5 @@
-Hello - this is APP
-
-home
-
+Hello - this is APP
+
+home
+
 =fa_icon 'folder-o'

data/spec/dummy/app/views/news/index.html.haml

@@ -1,13 +1,13 @@
-%h1 News
-
-page = #{@pg}
-- @items.each do |item|
-  %h3= item.title
-  = item.description
-
-
-%h3 urls
-
-%ul
-  %li=link_to 'News index', site_page_path('news')
-  %li=link_to 'News #1', site_page_path('news_item', id: 1)
+%h1 News
+
+page = #{@pg}
+- @items.each do |item|
+  %h3= item.title
+  = item.description
+
+
+%h3 urls
+
+%ul
+  %li=link_to 'News index', site_page_path('news')
+  %li=link_to 'News #1', site_page_path('news_item', id: 1)

data/spec/dummy/app/views/news/show.html.haml

@@ -1,7 +1,7 @@
-%hr
-=link_to "Back to news", site_page_path('news')
-%br
-
-%h1 #{@item.title}
-
+%hr
+=link_to "Back to news", site_page_path('news')
+%br
+
+%h1 #{@item.title}
+
 id: #{@item.id}

data/spec/dummy/app/views/pages/1.html.erb

@@ -1,16 +1,16 @@
-From code
-<p>News on page</p>
-
-<p>page = <%=@pg%></p>
-
-<p>hello</p>
-
-<p>&nbsp;</p>
-
-<p>local page = <%=@pg%></p>
-
-news count = <%=News.all.count%>
-<br>
-render<br>
-<%=render 'pages/sub.html.erb'%>
-
+From code
+<p>News on page</p>
+
+<p>page = <%=@pg%></p>
+
+<p>hello</p>
+
+<p>&nbsp;</p>
+
+<p>local page = <%=@pg%></p>
+
+news count = <%=News.all.count%>
+<br>
+render<br>
+<%=render 'pages/sub.html.erb'%>
+

data/spec/dummy/app/views/pages/about.html.erb

@@ -1,12 +1,12 @@
-1
-2
-3
-About
-<%=fa_icon "folder-o" %>
-
-111
-
-<br>
-
-<p>
-here
+1
+2
+3
+About
+<%=fa_icon "folder-o" %>
+
+111
+
+<br>
+
+<p>
+here

data/spec/dummy/app/views/pages/text1.html

@@ -1,2 +1,2 @@
-<p>1</p>
+<p>1</p>
 <p><img src="/img/funny-cats-and-kittens-wallpapers-12.jpg" alt="" width="640" height="480" /></p>

data/spec/dummy/app/views/services/index.html.haml

@@ -1,10 +1,10 @@
-%h1 Услуги
-
-home 
-=link_to 'Home link', root_path
-
-=block 'index_top'
-
-тут список
-
+%h1 Услуги
+
+home 
+=link_to 'Home link', root_path
+
+=block 'index_top'
+
+тут список
+
 =block 'index_bottom'

data/spec/dummy/app/views/services/service.html.haml

@@ -1,3 +1,3 @@
-%h1 Service
-
+%h1 Service
+
 name: #{params[:name]}

data/spec/dummy/app/views/temp/html1.html

@@ -1,2 +1,2 @@
-<p>pp</p>
+<p>pp</p>
 <p><img src="/img/cat2.jpg" alt="" width="650" height="446" /></p>

data/spec/dummy/app/views/temp/multi1.html.haml

@@ -0,0 +1 @@
+1111

data/spec/dummy/app/views/temp/p1.html.haml

@@ -1,6 +1,6 @@
-include html:
-
-= block 'temp/h1'
-
-include haml:
-= block 'temp/part1'
+include html:
+
+= block 'temp/h1'
+
+include haml:
+= block 'temp/part1'