synergy_default_theme 1.0.1 → 1.0.2

data/app/controllers/home_controller.rb

@@ -2,9 +2,7 @@ class HomeController < Spree::BaseController
   helper :products, :taxons
 
   def index
-    @taxons = Rails.cache.fetch('homepage-taxons', :expires_in => LONG_INTERVAL) do
-      home_taxonomy = get_taxonomies.find{|t| t.show_on_homepage? }
-      home_taxonomy ? home_taxonomy.root.children : []
-    end
+    home_taxonomy = get_taxonomies.find{|t| t.show_on_homepage? }
+    @taxons = home_taxonomy ? home_taxonomy.root.children : []
   end
 end

data/app/views/admin/reviews/index.html.erb

@@ -1,3 +1,4 @@
+<% render 'admin/shared/product_sub_menu' %>
 <h1><%= t('review_management_description') %></h1>
 
 <% for reviews in [["Unapproved", @unapproved_reviews], ["Approved", @approved_reviews]] %>
@@ -15,25 +16,23 @@
     <% for review in reviews[1] %>
     <tr>
       <td>
-        <%= l review.created_at %>
+        <%= review.created_at.to_date %>
       </td>
       <td>
-        <%= review.name %><%= t('from') %> <%= review.location %>
+        <%= review.name %><%= " (#{review.user.email})" if review.user %>
       </td>
       <td>
         <%= link_to review.product.name, product_path(review.product) %>
       </td>
-      <td style="border: 1px dashed green" width="60%">
-        <br/>
+      <td width="50%">
         <%= h review.review %>
       </td>
       <td>
         <% unless review.approved %>
-          <%= link_to t('approve'), {:action => 'approve', :id => review.id} %> <br />
+          <%= link_to_with_icon 'tick', t('approve'), {:action => 'approve', :id => review.id} %> <br />
         <% end %>
-        <%= link_to t('edit'), [:edit, :admin, review] %> <br/>
-        <%= link_to t('destroy'), [:admin, review], :method => :delete, :confirm => t('are_you_sure_review') %>
-
+        <%= link_to_edit review %><br />
+        <%= link_to_delete review %>
       </td>
     </tr>
   <% end %>

data/app/views/admin/taxonomies/_list.html.erb

@@ -1,15 +1,19 @@
 <table class="index">
   <tr>
     <th><%= t('name') %></th>
+    <% if defined?(SpreeCompareProducts) %>
     <th><%= t('compare_products.comparable_container') %></th>
-    <th>Отображать на главной странице</th>
+    <% end %>
+    <th><%= t('activerecord.attributes.taxonomy.show_on_homepage').capitalize %></th>
     <th></th>
   </tr>
   
   <% for taxonomy in @taxonomies %>
     <tr id="<%= dom_id taxonomy %>">
       <td><%= taxonomy.name %></td>
+      <% if defined?(SpreeCompareProducts) %>
       <td><%= icon('tick') if taxonomy.comparable? %></td>
+      <% end %>
       <td><%= icon('tick') if taxonomy.show_on_homepage? %></td>
       <td class="actions">
         <%= link_to_edit taxonomy.id %> &nbsp; <%= link_to_delete taxonomy %>

data/app/views/admin/taxonomies/_show_on_homepage_field.html.erb

@@ -1,4 +1,4 @@
 <% field_container :taxonomy, :show_on_homepage do %>
   <%= check_box :taxonomy, :show_on_homepage  %>
-  <%= label :taxonomy, :show_on_homepage, 'отображать на главной странице' %>
+  <%= label :taxonomy, :show_on_homepage, t('activerecord.attributes.taxonomy.show_on_homepage') %>
 <% end %>

data/app/views/layouts/spree_application.html.erb

@@ -19,14 +19,14 @@
   <div class="main_top" align="center">
     <div class="header_panel">
       <ul>
-        <li style="text-align: center; width: 265px">
+        <li class="header_panel_logo">
           <div><%= link_to image_tag("logo.png", :alt => "Synergy logo"), root_url %></div></li>
-        <li style="padding-left: 16px; width: 400px"><%= render 'shared/search' %></li>
-        <li>
+        <li class="header_panel_search"><%= render 'shared/search' %></li>
+        <li class="header_panel_cart">
           <div><%= link_to_cart %></div>
         </li>
-        <li>
-          <% if defined?(SpreeCompareProducts) %>
+        <% if defined?(SpreeCompareProducts) %>
+        <li class="header_panel_compare_product">
             <div><%= link_to(t(:product_comparison, :scope => :compare_products) + (@comparable_products.size > 0 ? " (#{@comparable_products.count})" : ""),
                              compare_products_path, :id => "compare_products") %></div>
             <div id="tooltip" class="tooltip" style="display: none">
@@ -38,8 +38,8 @@
               </div>
               <div class="tooltip_bottom"></div>
             </div>
-          <% end %>
         </li>
+        <% end %>
       </ul>
     </div>
   </div>

data/app/views/products/_image.html.erb

@@ -1,7 +1,7 @@
 <%
    image ||= @product.images.first
    if image %>
-  <%= link_to image_tag(image.attachment.url(:product)), image.attachment.url(:large), :rel => '#large_image_overlay' %>
+  <%= link_to image_tag(image.attachment.url(:product), :alt => image.alt.present? ? image.alt : @product.name), image.attachment.url(:large), :rel => '#large_image_overlay' %>
 <% else %>
   <%= product_image(@product) %>
 <% end %>

data/app/views/shared/_head.html.erb

@@ -1,12 +1,15 @@
 <title><%= title %></title>
 <meta http-equiv="Content-Type" content="text/html;charset=utf-8" />
+<link rel="shortcut icon" type="image/vnd.microsoft.icon" href="/favicon.ico" />
+<link rel="icon" type="image/png" href="/favicon.png" />
+
 <%== meta_data_tags %>
 <%= csrf_meta_tag %>
 
 <%= hook :inside_head do %>
   <%== stylesheet_tags %>
   <%= stylesheet_link_tag 'jquery.jgrowl' %>
-  <%= javascript_include_tag 'jquery-1.4.2.min', 'jquery.validate.min.js', 'rails', 'application', 'jquery.jgrowl.min', :cache => 'jquery-libs' %>
+  <%= javascript_include_tag 'jquery-1.4.2.min', 'jquery.validate.min.js', 'rails', 'application', 'jquery.jgrowl.min', 'jquery.tools.min.js', :cache => 'jquery-libs' %>
 <% end %>
 <%= stylesheet_link_tag 'style' %>
 <% unless I18n.locale.to_s[0..1] == 'en' %>

data/app/views/shared/_login_bar.html.erb

@@ -6,12 +6,11 @@
   <div class="simple_overlay" id="login_overlay" style="display: none">
     <% if defined?(SpreeSocial) %>
     <div class="login_social_bar">
-      <div style="margin: 6px 0">Войти в магазин с помощью:</div>
+      <div style="margin: 6px 0"><%= t(:sign_in_through_one_of_these_services) %>:</div>
       <div style="margin: 6px 0">
-        <%= image_tag 'twitter_32.png' %>
-        <%= image_tag 'vkontakte_32.png' %>
-        <%= image_tag 'facebook_32.png' %>
-        <%= image_tag 'google_32.png' %>
+        <% AuthenticationMethod.where(:environment => ::Rails.env).each do |user| %>
+          <%= link_to(image_tag("social/#{user.preferred_provider}_32.png", :size => "32x32", :alt => "#{user.preferred_provider}"), user_authentication_omniauth_authorize_path(user.preferred_provider.to_sym), :title => t(:sign_in_with_provider, :provider => user.preferred_provider)) if user.active %>
+        <% end %>
       </div>
     </div>
     <% end %>

data/app/views/shared/_review.html.erb

@@ -2,7 +2,7 @@
   <span class="rating" title="<%= txt_stars(review.rating) %>">
     <%= render :partial => "reviews/stars", :locals => {:stars => review.rating} %>
   </span>
-  <span class="title"><%= review.title %></span>
+  <span class="name"><%= review.name %></span>
   <span class="attribution"><strong><%= l(review.created_at.to_date, :format => :long) %></strong></span>
   <p>
   <%= simple_format(review.review) %>

data/app/views/shared/_reviews.html.erb

@@ -28,7 +28,7 @@
         'review[rating]': {
           required: true
         },
-        'review[title]': {
+        'review[name]': {
           required: true
         }
       },

data/app/views/shared/_synergy_compare_products_js.html.erb

@@ -1,5 +1,3 @@
-<%= javascript_include_tag 'jquery.tools.min.js' %>
-
 <script type="text/javascript">
   $(function() {
     var cp_wrapper = $('#comparable_products_wrapper').detach();

data/app/views/shared/_taxonomies.html.erb

@@ -8,7 +8,14 @@
       <% taxonomy.root.children.each do |taxon| %>
         <li<%== ' class="current"' if @taxon and ([@taxon] + @taxon.ancestors).include?(taxon) %>>
           <%= link_to taxon.name, seo_url(taxon) %>
-        </li>
+          <% if taxon.children.any? %>
+          <ul class="nav-list">
+            <% taxon.children.each do |t| %>
+            <li<%== ' class="current"' if @taxon == t %>><%= link_to t.name, seo_url(t) %></li>
+            <% end %>
+          </ul>
+          <% end %>
+       </li>
       <% end %>
     </ul>
   <% end %>

data/config/locales/ru.yml

@@ -3,6 +3,8 @@ ru:
     attributes:
       user:
         email: "Электронная почта"
+      taxonomy:
+        show_on_homepage: "отображать на главной странице"
 
   number:
     # Used in number_to_currency()
@@ -21,7 +23,7 @@ ru:
   email: "Электронная почта"
   email_address: "Адрес электронной почты"
   back_to_store: "Назад в магазин"
-  review_title: "Ваше имя"
+  review_name: "Ваше имя"
   product_properties: "Характеристики"
   recently_viewed_products: "Вы недавно смотрели"
   submit_your_review: "Добавить отзыв"

data/public/stylesheets/style.css

@@ -47,6 +47,16 @@ h1, h2, h3, h4, h5, h6 {
   margin-top: 4px;
 }
 
+.header_panel .header_panel_logo {
+  text-align: center;
+  width: 265px;
+}
+
+.header_panel .header_panel_search {
+  padding-left: 16px;
+  width: 400px;
+}
+
 .header_panel #taxon {
   display: none;
 }
@@ -296,6 +306,18 @@ ul.nav-list li.current a {
   font-weight: bold;
 }
 
+ul.nav-list ul.nav-list {
+  margin: 0 0 0 1em;
+}
+
+ul.nav-list ul.nav-list li a {
+  font-weight: normal;
+}
+
+ul.nav-list ul.nav-list li.current a {
+  font-weight: bold;
+}
+
 #taxonomies {
   margin-bottom: 3em;
 }
@@ -722,10 +744,14 @@ hr.space {
   border-bottom: 1px solid #ddd;
 }
 
-#new_review #review_title {
+#new_review #review_name {
   width: 200px;
 }
 
+#new_review .review_title_field {
+  display: none;
+}
+
 #new_review .review_rating_field {
   float: right;
   width: 480px;
@@ -783,7 +809,7 @@ hr.space {
   vertical-align: middle;
 }
 
-.review .title {
+.review .name {
   margin: 0 2em;
   color: #3d5a75;
 }
@@ -993,12 +1019,12 @@ h4#variant-images {
   border-bottom: 1px solid #eee;
 }
 
-#order_details {
+table#order_details {
   border-top: 2px solid black;
   border-bottom: 2px solid black;
 }
 
-#order_details th {
+table#order_details th {
   background: url("../images/cart_th_bg.png") repeat-x;
   height: 34px;
   border-bottom: 1px solid silver;
@@ -1012,6 +1038,16 @@ div.rating-cancel {
   padding-left: 5px;
 }
 
+#registration #guest_checkout {
+  width: 51%;
+  float: right;
+}
+
+div#checkout #checkout_form_address #shipping label {
+  width: auto;
+  padding-right: 0;
+}
+
 /* jGrowl */
 
 div#jGrowl.top-right {

data/synergy_default_theme.gemspec

@@ -1,7 +1,7 @@
 Gem::Specification.new do |s|
   s.platform    = Gem::Platform::RUBY
   s.name        = 'synergy_default_theme'
-  s.version     = '1.0.1'
+  s.version     = '1.0.2'
   s.summary     = 'Default theme for Synergy'
   s.description = 'Тема по умолчанию для платформы электронной коммерции Synergy, основанной на Spree'
   s.required_ruby_version = '>= 1.8.7'

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 1
   - 0
-  - 1
-  version: 1.0.1
+  - 2
+  version: 1.0.2
 platform: ruby
 authors: 
 - Service & Consulting
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-05-12 00:00:00 +04:00
+date: 2011-07-03 00:00:00 +04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -112,6 +112,8 @@ files:
 - lib/synergy_default_theme_hooks.rb
 - lib/tasks/install.rake
 - lib/tasks/synergy_default_theme.rake
+- public/favicon.ico
+- public/favicon.png
 - public/images/bubblepopup_bg.png
 - public/images/bubblepopup_bottom.png
 - public/images/bubblepopup_top.png
@@ -135,6 +137,10 @@ files:
 - public/images/search_button.png
 - public/images/search_textinput.png
 - public/images/search_textinput_active.png
+- public/images/social/facebook_32.png
+- public/images/social/google_32.png
+- public/images/social/twitter_32.png
+- public/images/social/vkontakte_32.png
 - public/images/star.png
 - public/images/star_orange.png
 - public/images/star_white.png