optimacms 0.1.59 → 0.1.60

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,50 +1,48 @@
-class NewsController < ApplicationController
-
-  before_action :set_page, only: [:index, :index_page]
-
-  def index
-
-    x = params[:pg]
-
-    @items = News.all
-
-    y = site_page_path('news_item', {id: 1, name: 'mama'})
-    z=0
-
-  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/home/index.html.haml

@@ -1,19 +1,19 @@
-%h2 Admin
-%ul
-  %li= link_to '/cmsadmin', '/cmsadmin'
-
-%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/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/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'

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

@@ -1,14 +1,14 @@
-text here
-t1
-
-yes
-
-yes
-
-%h2 URLs
-
-=link_to 'about', site_page_path('about')
-%br
-=link_to 'about again', site_page_path('about')
-%br
+text here
+t1
+
+yes
+
+yes
+
+%h2 URLs
+
+=link_to 'about', site_page_path('about')
+%br
+=link_to 'about again', site_page_path('about')
+%br
 =link_to 'news item #1', site_page_path('news_item', :id=>1)

data/spec/dummy/app/views/temp9/t2.html

@@ -1,9 +1,9 @@
-<h2><a href="http://aviservice.com.ua/"> AVI Service</a> <small>Ремонт ноутбуков в Харькове</small></h2>
-<p>Основные направления деятельности компании AVI Service</p>
-<ul class="list-2">
-<li>Продажа ноутбуков, комплектующих, компьютерной и офисной техники;</li>
-<li>Ремонт ноутбуков;</li>
-<li>Гарантийное и послегарантийное обслуживание компьютерной техники;</li>
-<li>Заправка картриджей для принтеров;</li>
-<li><img src="/uploads/avatar2.jpg" alt="" width="333" height="250" /></li>
+<h2><a href="http://aviservice.com.ua/"> AVI Service</a> <small>Ремонт ноутбуков в Харькове</small></h2>
+<p>Основные направления деятельности компании AVI Service</p>
+<ul class="list-2">
+<li>Продажа ноутбуков, комплектующих, компьютерной и офисной техники;</li>
+<li>Ремонт ноутбуков;</li>
+<li>Гарантийное и послегарантийное обслуживание компьютерной техники;</li>
+<li>Заправка картриджей для принтеров;</li>
+<li><img src="/uploads/avatar2.jpg" alt="" width="333" height="250" /></li>
 </ul>

data/spec/dummy/app/views/workers/_breadcrumb_worker.html.haml

@@ -1,11 +1,11 @@
-%ol.breadcrumb
-  -#%li=link_to 'BuildWinner', root_path
-  %li
-    Мастера:
-  - if @item.country
-    %li=link_to 'Украина', make_workers_path(@item.country, nil)
-  - if @item.city
-    %li=link_to @item.city.name, make_workers_path(@item.country, @item.city)
-
-  %li=link_to @item.title, worker_path(name: @item.slug)
-
+%ol.breadcrumb
+  -#%li=link_to 'BuildWinner', root_path
+  %li
+    Мастера:
+  - if @item.country
+    %li=link_to 'Украина', make_workers_path(@item.country, nil)
+  - if @item.city
+    %li=link_to @item.city.name, make_workers_path(@item.country, @item.city)
+
+  %li=link_to @item.title, worker_path(name: @item.slug)
+

data/spec/dummy/app/views/workers/_breadcrumb_workers.html.haml

@@ -1,9 +1,9 @@
-%ol.breadcrumb
-  %li
-    Мастера:
-  %li=link_to @country.name, make_workers_path(@country, nil)
-  - unless @city.nil?
-    %li=link_to ''+@city.name, make_workers_path(@country, @city)
-  - unless @category.nil?
-    %li=link_to ''+@category.title, make_workers_path(@country, @city, @category)
-
+%ol.breadcrumb
+  %li
+    Мастера:
+  %li=link_to @country.name, make_workers_path(@country, nil)
+  - unless @city.nil?
+    %li=link_to ''+@city.name, make_workers_path(@country, @city)
+  - unless @category.nil?
+    %li=link_to ''+@category.title, make_workers_path(@country, @city, @category)
+

data/spec/dummy/app/views/workers/_contacts_our.html.haml

@@ -1,4 +1,4 @@
-Кол-центр: +380 50 1908090
-%br
-%br
+Кол-центр: +380 50 1908090
+%br
+%br
 = link_to 'Обратный звонок', '#', :class=>'btn btn-primary btn-sm callback_link'

data/spec/dummy/app/views/workers/_list_worker.html.haml

@@ -1,46 +1,46 @@
-.row.worker
-  .col-md-18.nopadding
-    .pull-left.cont-avatar
-      =link_to worker_path(:name=>item.slug), class: 't' do
-        = image_tag item.avatar.url(:medium), :class=>'avatar avatar-lg'
-    .pull-left.cont-main
-      .pull-left
-        =link_to item.title, worker_path(:name=>item.slug), class: 't'
-      .pull-left.icons
-         
-        - if item.is_verified?
-          %i.fa.fa-check-square.color2{title: 'Проверенный исполнитель'}
-
-      .clearfix
-      .location
-        - if item.city
-          =item.city.name
-        - elsif item.region
-          =item.region.name
-        - else
-          Город: не указано
-
-      .desc.desc-w
-        =truncate item.description, length: 200
-
-    .clearfix
-
-    -#.status-links
-      =link_to '#' do
-        Рейтинг: 150
-
-      =link_to '#' do
-        Отзывы (0)
-
-      Последний визит:
-      = date_default(item.user.last_sign_in_at)
-
-  .col-md-6
-    =link_to 'Заказать ремонт', new_project_path(:to=>item.public_name), class: 'btn btn-primary btn-sm'
-    %br
-    %br
-    =link_to 'Отправить сообщение', show_dialog_path(:username=>item.user.username), :class=>'link-light link-sm'
-    %br
-    -#=link_to 'Перезвоните мне', '#', :class=>'link-light link-sm'
-
-.clearfix
+.row.worker
+  .col-md-18.nopadding
+    .pull-left.cont-avatar
+      =link_to worker_path(:name=>item.slug), class: 't' do
+        = image_tag item.avatar.url(:medium), :class=>'avatar avatar-lg'
+    .pull-left.cont-main
+      .pull-left
+        =link_to item.title, worker_path(:name=>item.slug), class: 't'
+      .pull-left.icons
+         
+        - if item.is_verified?
+          %i.fa.fa-check-square.color2{title: 'Проверенный исполнитель'}
+
+      .clearfix
+      .location
+        - if item.city
+          =item.city.name
+        - elsif item.region
+          =item.region.name
+        - else
+          Город: не указано
+
+      .desc.desc-w
+        =truncate item.description, length: 200
+
+    .clearfix
+
+    -#.status-links
+      =link_to '#' do
+        Рейтинг: 150
+
+      =link_to '#' do
+        Отзывы (0)
+
+      Последний визит:
+      = date_default(item.user.last_sign_in_at)
+
+  .col-md-6
+    =link_to 'Заказать ремонт', new_project_path(:to=>item.public_name), class: 'btn btn-primary btn-sm'
+    %br
+    %br
+    =link_to 'Отправить сообщение', show_dialog_path(:username=>item.user.username), :class=>'link-light link-sm'
+    %br
+    -#=link_to 'Перезвоните мне', '#', :class=>'link-light link-sm'
+
+.clearfix