after some theming work + slugs random

Author: hatter

app/assets/javascripts/application.js

@@ -25,4 +25,12 @@
 //= require ckeditor/init
 
 
-//= require_tree .
+//= require_tree .
+
+
+
+
+// initialize bootstrap tooltips
+$(function () {
+    $("[data-toggle='tooltip']").tooltip();
+});

app/assets/javascripts/sites.js.coffee

@@ -1,3 +1,10 @@
 # Place all the behaviors and hooks related to the matching controller here.
 # All this logic will automatically be available in application.js.
 # You can use CoffeeScript in this file: http://coffeescript.org/
+
+
+# $(document).ready ->
+#   $(".modal").on("ajax:success", (e, data, status, xhr) ->
+#     $('.modal').modal('hide')
+#   ).on "ajax:error", (e, xhr, status, error) ->
+#     $("body").append "<p>ERROR</p>"

app/assets/stylesheets/login_corner.css.scss

@@ -0,0 +1,8 @@
+.login_corner {
+  width: 20px;
+  height: 20px;
+  position: absolute;
+  top: 0px;
+  right: 0px;
+  z-index: 800;
+}

app/assets/stylesheets/theme_white.css.scss

@@ -8,17 +8,48 @@
   border-radius: 5px;
 }
 
+html {
+  min-height: 100%;
+  position: relative;
+}
+
+body {
+  font-size: 16px;
+  padding-bottom: 60px;
+}
+
 
+.line_div_2px {
+  width: 100%;
+  height: 2px;
+  background: #F2F2F2;
+}
+
+.btn.gl_indent .glyphicon,
+a.gl_indent .glyphicon {
+  padding: 0 6px 0 0px;
+}
 
 // ==================== Hedader ====================
 
 .header {
-  margin: 20px 0px;
+  margin: 20px 0px 0px 0px;
   padding-bottom: 20px;
-  border-bottom: 2px solid #E5E5E5;
+  // border-bottom: 2px solid #E5E5E5;
 }
 
 
+// ==================== config_cog ====================
+
+.config_cog {
+  position: absolute;
+  right: 0px; top: -10px;
+  display: none;
+}
+
+div:hover > .config_cog{
+  display: block;
+}
 // ==================== Logo ====================
 
 
@@ -31,11 +62,6 @@
     display: none;
   }
 }
-.logo_container:hover {
-  .config_cog {
-    display: block;
-  }
-}
 
 
 // ==================== home_button ====================
@@ -52,9 +78,14 @@
   position: absolute;
   top: 50%; right: 0px;
   height: 30px;
-  margin-top: -35px;
+  margin-top: -15px;
 }
 
+// .header_menu {
+//   position: absolute;
+//   bottom: 10px; right: 0px;
+// }
+
 
 .menu_links{
   position: relative;
@@ -101,10 +132,13 @@
       font-size: 20px;
       float: left;
     }
-    .btn {
 
+    span.badge {
+      margin: 7px 0 0 10px;
     }
 
+
+
     .catalog_categoryes_container {
       float: none;
       clear: both;
@@ -126,11 +160,22 @@
 
 }
 
-
+// =============================================================
+//                            big_image
+// =============================================================
+.big_image {
+  position: relative;
+  img {
+    width: 100%;
+  }
+}
 
 // ==================== page ====================
 
 .page_container {
+
+  margin: 0 0 40px 0;
+
   .edit_page_button {
     display: none;
 
@@ -168,8 +213,37 @@
 }
 
 
+.field_with_errors {
+  @extend .has-error;
+}
+
+
+
+// =============================================================
+//                         img_catalog
+// =============================================================
+
+.img_catalog {
+  margin: 40px 0 40px 0;
+
+  h1 {
+    margin-bottom: 20px;
+  }
+}
+
+
+
+// =============================================================
+//                            #footer
+// =============================================================
+
+#footer {
+  padding: 20px 0 0 0;
+  position: absolute;
+  height: 60px;
+  width: 100%;
+  background-color: #F5F5F5;
+  bottom: 0;
+}
 
 
-.field_with_errors {
-  @extend .has-error
-}

app/assets/stylesheets/top_bar.css.scss

@@ -0,0 +1,29 @@
+.top_bar_container {
+  background: #999;
+  .logo {
+    margin: 12px 0 0 5px;
+  }
+
+  ul {
+    margin: 0;
+    background: url('/other_img/gradient_border.png') right repeat-y;
+    li {
+      float: left;
+      list-style: none;
+    }
+  }
+
+
+  a {
+    display: block;
+    text-decoration: none;
+    text-transform: lowercase;
+    float: left;
+    color: #fff;
+    padding: 20px 20px;
+    background: url('/other_img/gradient_border.png') left repeat-y;
+  }
+  a:hover {
+    background: #666;
+  }
+}

app/controllers/application_controller.rb

@@ -9,7 +9,7 @@ class ApplicationController < ActionController::Base
 # request.host != 'r-code-main.com' && request.domain != 'lvh.me'
 
   def current_site
-    if request.domain == 'snowboarding.by'#'snowboarding.by' #|| request.domain = 'lvh.me'
+    if request.domain == 'r-code-main.com'#'snowboarding.by' #|| request.domain = 'lvh.me'
       if request.subdomain.present?
         @site = Site.where('sub_domain = ?', request.subdomain.sub(/^www./,'')).first!
       else

app/controllers/catalogs_controller.rb

@@ -19,7 +19,7 @@ def create
     respond_to do |format|
       if @catalog.save
         @menu_item = MenuItem.create(link: catalog_url(@catalog), catalog_id: @catalog.id, menu_id: @catalog.menu_id, title: @catalog.title)
-        format.html { redirect_to catalog_url(@catalog), notice: 'Catalog was successfully created.' }
+        format.html { redirect_to menu_url(@catalog.menu), notice: 'Catalog was successfully created.' }
       else
         flash[:error] = "there was a problem"
       end
@@ -35,7 +35,7 @@ def update
     load_catalog
     if @catalog.update(catalog_params)
       @catalog.menu_items.update_all(link: catalog_url(@catalog), title: @catalog.title)
-      redirect_to @catalog
+      redirect_to menu_url(@catalog.menu)
     end
 
   end

app/controllers/menus_controller.rb

@@ -1,5 +1,6 @@
 class MenusController < ApplicationController
-  
+   before_filter :authenticate_user!, only: [:show,:new, :edit, :update, :destroy]
+   before_filter :correct_user, :only => [:show, :destroy, :edit , :update]
 
   def show
     load_menu

app/controllers/pages_controller.rb

@@ -38,11 +38,16 @@ def create
 
   def update
     load_page
-    if @page.update(page_params)
-      @page.menu_items.update_all(link: page_url(@page), title: @page.title)
-      redirect_to @page
+    respond_to do |format|
+      if @page.update(page_params)
+        @page.menu_items.update_all(link: page_url(@page), title: @page.title)
+        format.html { redirect_to @page, notice: 'Page was successfully updated.' }
+        format.json { head :no_content }
+      else
+        format.html { render action: 'edit' }
+        format.json { render json: @page.errors, status: :unprocessable_entity }
+      end
     end
-
   end
 
 

app/controllers/sites_controller.rb

@@ -87,7 +87,7 @@ def set_site
 
     # Never trust parameters from the scary internet, only allow the white list through.
     def site_params
-      params.require(:site).permit(:domain, :sub_domain, :name, :user_id, :front_page_id, :remove_site_logo, :site_logo, :site_logo_cache, :image_slot_1_cache, :image_slot_1, :footer_text)
+      params.require(:site).permit(:domain, :sub_domain, :name, :theme, :user_id, :front_page_id, :remove_site_logo, :site_logo, :site_logo_cache, :image_slot_1_cache, :image_slot_1, :footer_text)
     end
 
 

app/helpers/pages_helper.rb

@@ -1,6 +1,8 @@
 module PagesHelper
 
   def is_front?
-    true if @page.id == current_site.front_page_id
+    if @page
+      true if @page.id == current_site.front_page_id
+    end
   end
 end

app/helpers/sites_helper.rb

@@ -1,2 +1,7 @@
 module SitesHelper
+
+  def site_theme_select_options
+    Site::THEMES.map { |theme| [t("site.firms.#{theme}"), theme] }
+  end
+
 end

app/models/catalog_item.rb

@@ -2,14 +2,16 @@
 #
 # Table name: catalog_items
 #
-#  id          :integer          not null, primary key
-#  category_id :integer
-#  title       :string(255)
-#  slug        :string(255)
-#  price       :integer
-#  weight      :integer
-#  created_at  :datetime
-#  updated_at  :datetime
+#  id               :integer          not null, primary key
+#  category_id      :integer
+#  title            :string(255)
+#  body             :text
+#  catalog_item_img :string(255)
+#  slug             :string(255)
+#  price            :integer
+#  weight           :integer
+#  created_at       :datetime
+#  updated_at       :datetime
 #
 
 class CatalogItem < ActiveRecord::Base

app/models/category.rb

@@ -2,27 +2,36 @@
 #
 # Table name: categories
 #
-#  id         :integer          not null, primary key
-#  catalog_id :integer
-#  title      :string(255)
-#  slug       :string(255)
-#  weight     :integer
-#  created_at :datetime
-#  updated_at :datetime
+#  id           :integer          not null, primary key
+#  catalog_id   :integer
+#  title        :string(255)
+#  category_img :string(255)
+#  slug         :string(255)
+#  weight       :integer
+#  created_at   :datetime
+#  updated_at   :datetime
 #
 
 class Category < ActiveRecord::Base
 
   extend FriendlyId
-  friendly_id :title, use: :slugged
+  friendly_id :slug_candidates, use: :slugged
 
   belongs_to :catalog
-  has_many :catalog_items
+  has_many :catalog_items, dependent: :destroy
 
   mount_uploader :category_img, CategoryImgUploader
 
   def should_generate_new_friendly_id?
     slug.blank? || title_changed?
   end
+
+    def slug_candidates
+    [
+      :title,
+      [:title, Random.rand(1..10)],
+      [:title, Random.rand(10..99)]
+    ]
+  end
 
 end

app/models/page.rb

@@ -14,7 +14,6 @@
 #
 
 class Page < ActiveRecord::Base
-  # after_save :upfate_munu_item
 
   validates :title, presence: true
 
@@ -34,8 +33,4 @@ def should_generate_new_friendly_id?
     slug.blank? || title_changed?
   end
 
-
-  # def upfate_munu_item
-  #   self.menu_items.each {|d| d.save! }
-  # end
 end