optimacms 0.1.59 → 0.1.60

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

@@ -1,6 +1,6 @@
-#workers
-  - items.each do |r|
-    = render 'list_worker', item: r
-
-  -# 1.upto 10 do |r|
-    = render 'list_worker', item: r
+#workers
+  - items.each do |r|
+    = render 'list_worker', item: r
+
+  -# 1.upto 10 do |r|
+    = render 'list_worker', item: r

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

@@ -1,22 +1,22 @@
-= render 'shared/js_share'
-
-:javascript
-  $( document ).ready(function() {
-    var url_this = "#{make_company_url(item)}";
-    var title = "#{@share_title}";
-    var img_url = "#{@share_img}";
-    var desc = "#{@share_desc}";
-
-    $('.profile-socials a.facebook').click(function(e){
-      e.preventDefault();
-
-      Share.facebook(url_this,title,img_url,desc);
-
-    });
-
-    $('.profile-socials a.vk').click(function(e){
-      e.preventDefault();
-      Share.vkontakte(url_this,title,img_url,desc);
-    });
-
-  });
+= render 'shared/js_share'
+
+:javascript
+  $( document ).ready(function() {
+    var url_this = "#{make_company_url(item)}";
+    var title = "#{@share_title}";
+    var img_url = "#{@share_img}";
+    var desc = "#{@share_desc}";
+
+    $('.profile-socials a.facebook').click(function(e){
+      e.preventDefault();
+
+      Share.facebook(url_this,title,img_url,desc);
+
+    });
+
+    $('.profile-socials a.vk').click(function(e){
+      e.preventDefault();
+      Share.vkontakte(url_this,title,img_url,desc);
+    });
+
+  });

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

@@ -1,12 +1,12 @@
-поделиться:
-%ul.profile-socials.socials-default.list-inline
-  %li
-    %a.facebook.fb-share-button(href="https://www.facebook.com/buildwinner" target="_blank")
-      %i.fa.fa-facebook.square-2-lg
-  %li
-    %a.vk(href="#" target="_blank")
-      %i.fa.fa-vk.square-2-lg
-
-  -#%li
-    %a.twitter(href="#" target="_blank")
+поделиться:
+%ul.profile-socials.socials-default.list-inline
+  %li
+    %a.facebook.fb-share-button(href="https://www.facebook.com/buildwinner" target="_blank")
+      %i.fa.fa-facebook.square-2-lg
+  %li
+    %a.vk(href="#" target="_blank")
+      %i.fa.fa-vk.square-2-lg
+
+  -#%li
+    %a.twitter(href="#" target="_blank")
       %i.fa.fa-twitter.square-2-lg

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

@@ -1,53 +1,53 @@
-
-.block-basic.profile-top-info
-  .row
-    .pull-left
-      = image_tag @item.avatar.url(:medium), :class=>'avatar avatar-lg'
-      %br
-    .col-md-9.profile-info-cont
-      %h1=@item.title
-      %span.location
-        - if @item.city
-          =@item.city.name
-        - elsif @item.region
-          =@item.region.name
-      %span
-        - if @item.is_verified?
-          %i.fa.fa-check-square.color2
-          %b Проверенный исполнитель
-        -#=link_to '[?]', '#'
-          %br
-      .tinfo
-        На сайте #{time_ago_in_words(@item.created_at)} (заходил #{time_ago_in_words(@item.user.last_sign_in_at)} назад)
-
-
-    .col-md-6
-      %ul.profile-cmd
-        %li
-          =link_to 'Заказать ремонт', new_project_path(:to=>@item.public_name), :class=>'btn btn-primary'
-        %li
-          =link_to 'Отправить сообщение', show_dialog_path(:username=>@item.user.username)
-      -#.contacts
-        %b Контакты
-        %br
-
-        %br
-        %br
-        - if @item.is_our?
-          = render 'show_info_contacts_our'
-          %br
-        - else
-          - @contacts_main.each do |contact|
-            = contact_type_icon(contact.contact_type)
-            = contact.title
-            -#= contact_notes(contact)
-            %br
-
-        =link_to '» Все контакты'.html_safe, worker_contacts_path(:name=>@item.slug)
-
-
-    .col-md-5
-      = render 'share_worker', item: @item
-      -#=image_tag 'temp/rate_by.png'
-
-  .clearfix
+
+.block-basic.profile-top-info
+  .row
+    .pull-left
+      = image_tag @item.avatar.url(:medium), :class=>'avatar avatar-lg'
+      %br
+    .col-md-9.profile-info-cont
+      %h1=@item.title
+      %span.location
+        - if @item.city
+          =@item.city.name
+        - elsif @item.region
+          =@item.region.name
+      %span
+        - if @item.is_verified?
+          %i.fa.fa-check-square.color2
+          %b Проверенный исполнитель
+        -#=link_to '[?]', '#'
+          %br
+      .tinfo
+        На сайте #{time_ago_in_words(@item.created_at)} (заходил #{time_ago_in_words(@item.user.last_sign_in_at)} назад)
+
+
+    .col-md-6
+      %ul.profile-cmd
+        %li
+          =link_to 'Заказать ремонт', new_project_path(:to=>@item.public_name), :class=>'btn btn-primary'
+        %li
+          =link_to 'Отправить сообщение', show_dialog_path(:username=>@item.user.username)
+      -#.contacts
+        %b Контакты
+        %br
+
+        %br
+        %br
+        - if @item.is_our?
+          = render 'show_info_contacts_our'
+          %br
+        - else
+          - @contacts_main.each do |contact|
+            = contact_type_icon(contact.contact_type)
+            = contact.title
+            -#= contact_notes(contact)
+            %br
+
+        =link_to '» Все контакты'.html_safe, worker_contacts_path(:name=>@item.slug)
+
+
+    .col-md-5
+      = render 'share_worker', item: @item
+      -#=image_tag 'temp/rate_by.png'
+
+  .clearfix

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

@@ -1,12 +1,12 @@
-%ul#profile_tabs.nav.nav-tabs.nav-tabs-bordered
-  %li{role: "presentation", class: (active=='show' ? 'active' : nil)}
-    =link_to 'Описание', worker_path(:name=>@item.slug)
-  %li{role: "presentation", class: (active=='services' ? 'active' : nil)}
-    =link_to 'Услуги', worker_services_path(:name=>@item.slug)
-  %li{role: "presentation", class: (active=='portfolio' ? 'active' : nil)}
-    =link_to 'Примеры работ', worker_portfolio_path(:name=>@item.slug)
-  %li{role: "contacts", class: (active=='contacts' ? 'active' : nil)}
-    =link_to 'Контакты', worker_contacts_path(:name=>@item.slug)
-
-  -#%li{role: "presentation"}
+%ul#profile_tabs.nav.nav-tabs.nav-tabs-bordered
+  %li{role: "presentation", class: (active=='show' ? 'active' : nil)}
+    =link_to 'Описание', worker_path(:name=>@item.slug)
+  %li{role: "presentation", class: (active=='services' ? 'active' : nil)}
+    =link_to 'Услуги', worker_services_path(:name=>@item.slug)
+  %li{role: "presentation", class: (active=='portfolio' ? 'active' : nil)}
+    =link_to 'Примеры работ', worker_portfolio_path(:name=>@item.slug)
+  %li{role: "contacts", class: (active=='contacts' ? 'active' : nil)}
+    =link_to 'Контакты', worker_contacts_path(:name=>@item.slug)
+
+  -#%li{role: "presentation"}
     =link_to 'Отзывы', '#'

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

@@ -1,20 +1,20 @@
-%h2 Контакты
-
-- if @item.is_our?
-  = render 'contacts_our'
-
-- else
-  - unless @contacts.empty?
-    %ul.normal
-      - @contacts.each do |item|
-        %li
-          = contact_type_icon(item.contact_type)
-          = item.title
-          = contact_notes(item)
-
-%br
-%br
-%br
-%br
-%br
+%h2 Контакты
+
+- if @item.is_our?
+  = render 'contacts_our'
+
+- else
+  - unless @contacts.empty?
+    %ul.normal
+      - @contacts.each do |item|
+        %li
+          = contact_type_icon(item.contact_type)
+          = item.title
+          = contact_notes(item)
+
+%br
+%br
+%br
+%br
+%br
 %br

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

@@ -1,49 +1,49 @@
-= render 'breadcrumb_workers'
-
-%h1 Ремонтные бригады <span class="dotted" id="location">#{in_location(@country, @city)}</span>
-
-%p
-  Ремонтные бригады, мастера по ремонту #{in_location(@country, @city)}. Выберите специализацию:
-
-=render 'locations/popup_city', from: 'workers'
-
-%form.form-inline#form_category
-  .form-group
-    %label(for="category")
-      Специализация:
-    = select_tag "category", options_from_collection_for_select(@categories_top, "slug", "title", (@category_parent ? @category_parent.slug : nil)), class: 'form-control input-sm', :prompt=>'-- Все специализации --'
-
-
-- if @subcategories
-  #filter-subcats.block-light
-    .col-md-24
-      %ul.cats
-        %li{class: (@category_parent.id==@category.id ? 'cat-sm active' : 'cat-sm')}
-          =link_to 'Все', make_workers_path(@country, @city, @category_parent)
-
-        - @subcategories.each do |cat|
-          %li{class: (cat.id==@category.id ? 'cat-sm active' : 'cat-sm')}
-            =link_to cat.title, make_workers_path(@country, @city, cat)
-
-    .clearfix
-
-- if @items.count==0
-  %br
-  .well
-    По вашему запросу ничего не найдено. Измените условия поиска
-
-- else
-  = render 'list_workers', items: @items
-  .clearfix
-
-  = paginate @items
-
-.clearfix
-
-%p
-  %br
-  Поиск ремонтных бригад в вашем городе.
-
-
-%p
-  Еще текст
+= render 'breadcrumb_workers'
+
+%h1 Ремонтные бригады <span class="dotted" id="location">#{in_location(@country, @city)}</span>
+
+%p
+  Ремонтные бригады, мастера по ремонту #{in_location(@country, @city)}. Выберите специализацию:
+
+=render 'locations/popup_city', from: 'workers'
+
+%form.form-inline#form_category
+  .form-group
+    %label(for="category")
+      Специализация:
+    = select_tag "category", options_from_collection_for_select(@categories_top, "slug", "title", (@category_parent ? @category_parent.slug : nil)), class: 'form-control input-sm', :prompt=>'-- Все специализации --'
+
+
+- if @subcategories
+  #filter-subcats.block-light
+    .col-md-24
+      %ul.cats
+        %li{class: (@category_parent.id==@category.id ? 'cat-sm active' : 'cat-sm')}
+          =link_to 'Все', make_workers_path(@country, @city, @category_parent)
+
+        - @subcategories.each do |cat|
+          %li{class: (cat.id==@category.id ? 'cat-sm active' : 'cat-sm')}
+            =link_to cat.title, make_workers_path(@country, @city, cat)
+
+    .clearfix
+
+- if @items.count==0
+  %br
+  .well
+    По вашему запросу ничего не найдено. Измените условия поиска
+
+- else
+  = render 'list_workers', items: @items
+  .clearfix
+
+  = paginate @items
+
+.clearfix
+
+%p
+  %br
+  Поиск ремонтных бригад в вашем городе.
+
+
+%p
+  Еще текст

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

@@ -1,20 +1,20 @@
-%ul#list-photos-big.list-inline.list-photos
-  - @works.each do |r|
-    %li
-      - path = worker_work_path(:id=>r.id)
-      =link_to path do
-        - if r.main_photo.nil?
-          = noimage({:style=>'big'}, {:class=>'img-thumbnail'})
-        - else
-          = image_tag r.main_photo.photo.url(:big), :class=>'img-thumbnail'
-
-      .cont.cont-center
-        =link_to r.title, path, :class=>'t'
-
-.clearfix
-= paginate @works
-
-
-
-
-
+%ul#list-photos-big.list-inline.list-photos
+  - @works.each do |r|
+    %li
+      - path = worker_work_path(:id=>r.id)
+      =link_to path do
+        - if r.main_photo.nil?
+          = noimage({:style=>'big'}, {:class=>'img-thumbnail'})
+        - else
+          = image_tag r.main_photo.photo.url(:big), :class=>'img-thumbnail'
+
+      .cont.cont-center
+        =link_to r.title, path, :class=>'t'
+
+.clearfix
+= paginate @works
+
+
+
+
+

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

@@ -1,12 +1,12 @@
-- n = @categories.count
-- unless @categories.empty?
-  - @categories.each_with_index do |r, ind|
-    =link_to r.fulltitle, make_workers_path(@item.country, @item.city, r)
-    - unless ind+1 == n
-      ,
-  %br
-
-%br
-%br
-%br
+- n = @categories.count
+- unless @categories.empty?
+  - @categories.each_with_index do |r, ind|
+    =link_to r.fulltitle, make_workers_path(@item.country, @item.city, r)
+    - unless ind+1 == n
+      ,
+  %br
+
+%br
+%br
+%br
 %br

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

@@ -1,54 +1,54 @@
-.desc
-  =@item.description
-
-%br
-.headline
-  %h2 Специализация
-  .pull-right
-    =link_to '→ Все услуги'.html_safe, worker_services_path(:name=>@item.slug)
-
-- n = @categories.count
-- unless @categories.empty?
-  - @categories.each_with_index do |r, ind|
-    =link_to r.fulltitle, make_workers_path(@item.country, @item.city, r)
-    - unless ind+1 == n
-      ,
-  %br
-
-%br
-%div
-  .headline
-    %h2
-      =link_to "Фотографии работ", worker_portfolio_path(:name=>@item.slug)
-    .pull-right
-      =link_to '→ Все работы'.html_safe, worker_portfolio_path(:name=>@item.slug)
-
-  %ul.list-inline.list-photos
-    - @works.each do |r|
-      %li.col-sm-8.col-md-6
-        - path = worker_work_path(:id=>r.id)
-        =link_to path do
-          - if r.main_photo.nil?
-            = noimage({:style=>'medium'}, {:class=>'img-thumbnail'})
-          - else
-            = image_tag r.main_photo.photo.url(:medium), :class=>'img-thumbnail'
-
-        .cont.cont-center
-          =link_to r.title, path, :class=>'t'
-
-
-    -#
-      - 1.upto 4 do |r|
-        .col-sm-8.col-md-5
-          =link_to (image_tag 'temp/work'+r.to_s+'.jpg', :width=>240, :class=>'img-thumbnail')
-          .cont
-            =link_to 'плитка на кухне', '#', :class=>'t'
-            -#
-              %p
-                =link_to 'Отделочные работы', '#', :class=>'cat'
-                \/
-                =link_to 'Обшивка', '#', :class=>'subcat'
-  .clearfix
-
-%br
+.desc
+  =@item.description
+
+%br
+.headline
+  %h2 Специализация
+  .pull-right
+    =link_to '→ Все услуги'.html_safe, worker_services_path(:name=>@item.slug)
+
+- n = @categories.count
+- unless @categories.empty?
+  - @categories.each_with_index do |r, ind|
+    =link_to r.fulltitle, make_workers_path(@item.country, @item.city, r)
+    - unless ind+1 == n
+      ,
+  %br
+
+%br
+%div
+  .headline
+    %h2
+      =link_to "Фотографии работ", worker_portfolio_path(:name=>@item.slug)
+    .pull-right
+      =link_to '→ Все работы'.html_safe, worker_portfolio_path(:name=>@item.slug)
+
+  %ul.list-inline.list-photos
+    - @works.each do |r|
+      %li.col-sm-8.col-md-6
+        - path = worker_work_path(:id=>r.id)
+        =link_to path do
+          - if r.main_photo.nil?
+            = noimage({:style=>'medium'}, {:class=>'img-thumbnail'})
+          - else
+            = image_tag r.main_photo.photo.url(:medium), :class=>'img-thumbnail'
+
+        .cont.cont-center
+          =link_to r.title, path, :class=>'t'
+
+
+    -#
+      - 1.upto 4 do |r|
+        .col-sm-8.col-md-5
+          =link_to (image_tag 'temp/work'+r.to_s+'.jpg', :width=>240, :class=>'img-thumbnail')
+          .cont
+            =link_to 'плитка на кухне', '#', :class=>'t'
+            -#
+              %p
+                =link_to 'Отделочные работы', '#', :class=>'cat'
+                \/
+                =link_to 'Обшивка', '#', :class=>'subcat'
+  .clearfix
+
+%br
 %br

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

@@ -1,8 +1,8 @@
-%h1 Пользователь не найден
-
-Пользователь не найден либо был удален.
-%br
-
-Проверьте правильность написании имени #{params[:name]}.
-
-
+%h1 Пользователь не найден
+
+Пользователь не найден либо был удален.
+%br
+
+Проверьте правильность написании имени #{params[:name]}.
+
+

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

@@ -1,2 +1,2 @@
-1
+1
 2

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

@@ -1,43 +1,43 @@
-Примеры работ #{@item.title}
-%h2
-  = @work.title
-%p
-  =@work.description
-%br
-
-- unless @photos.empty?
-  %ul#list-photos-big.list-inline.list-photos
-    - @photos.each do |photo|
-      %li{'data-id'=>photo.id}
-        =link_to photo.photo.url(:large), :'data-toggle'=>"lightbox", :'data-gallery'=>"workphotos", :'data-parent'=>".list-photos", :'data-title'=>photo.title do
-          =image_tag photo.photo.url(:big), :class=>'img-thumbnail'
-          .cont.cont-center
-            %span.t=photo.title
-
-- else
-  %br
-
-.clearfix
-%br
-
-= stylesheet_link_tag    "ekko-lightbox.min", media: "all"
-= javascript_include_tag :'ekko-lightbox.min'
-
-
-:javascript
-  $(function() {
-    // delegate calls to data-toggle="lightbox"
-    $(document).delegate('*[data-toggle="lightbox"]:not([data-gallery="navigateTo"])', 'click', function(event) {
-        event.preventDefault();
-        return $(this).ekkoLightbox({
-            onShown: function() {
-            },
-            onNavigate: function(direction, itemIndex) {
-            }
-        });
-    });
-
-  });
-
-
-
+Примеры работ #{@item.title}
+%h2
+  = @work.title
+%p
+  =@work.description
+%br
+
+- unless @photos.empty?
+  %ul#list-photos-big.list-inline.list-photos
+    - @photos.each do |photo|
+      %li{'data-id'=>photo.id}
+        =link_to photo.photo.url(:large), :'data-toggle'=>"lightbox", :'data-gallery'=>"workphotos", :'data-parent'=>".list-photos", :'data-title'=>photo.title do
+          =image_tag photo.photo.url(:big), :class=>'img-thumbnail'
+          .cont.cont-center
+            %span.t=photo.title
+
+- else
+  %br
+
+.clearfix
+%br
+
+= stylesheet_link_tag    "ekko-lightbox.min", media: "all"
+= javascript_include_tag :'ekko-lightbox.min'
+
+
+:javascript
+  $(function() {
+    // delegate calls to data-toggle="lightbox"
+    $(document).delegate('*[data-toggle="lightbox"]:not([data-gallery="navigateTo"])', 'click', function(event) {
+        event.preventDefault();
+        return $(this).ekkoLightbox({
+            onShown: function() {
+            },
+            onNavigate: function(direction, itemIndex) {
+            }
+        });
+    });
+
+  });
+
+
+

data/spec/dummy/config/database.yml

@@ -19,7 +19,11 @@ default: &default
 
 development:
   <<: *default
-  database: my_cms
+  host: <%= Rails.application.secrets.db_host %>
+  database: <%= Rails.application.secrets.db %>
+  username: <%= Rails.application.secrets.db_user %>
+  password: <%= Rails.application.secrets.db_password %>
+
 
 # Warning: The database defined as "test" will be erased and
 # re-generated from your development database when you run "rake".

data/spec/dummy/config/initializers/optimacms.rb

@@ -1 +1,4 @@
-Optimacms.files_dir_path = 'img'
+Optimacms.main_namespace = '' # blank or any like 'cms'
+Optimacms.admin_namespace = 'admin'
+
+Optimacms.files_dir_path = 'img'