From b4209b7cc5fa145501f891c11c9552bbf98b5af9 Mon Sep 17 00:00:00 2001
From: yanxd <sxty32@hotmaill.com>
Date: Mon, 21 Apr 2014 15:41:51 +0800
Subject: [PATCH] jrating

---
 Gemfile                                       |   1 +
 Gemfile.lock                                  |   6 ++-
 app/controllers/ratings_controller.rb         |  15 ++++++
 app/models/softapplication.rb                 |   2 +
 app/views/layouts/base.html.erb               |   1 +
 app/views/softapplications/show.html.erb      |   6 ++-
 config/routes.rb                              |  24 ++++-----
 ...0421044829_create_seems_rateable_rates.rb} |   0
 ...0_create_seems_rateable_cached_ratings.rb} |   0
 db/schema.rb                                  |   2 +-
 .../seems_rateable/ratings_controller.rb      |  17 ------
 .../images/seems_rateable/bg_jRatingInfos.png | Bin 0 -> 572 bytes
 public/images/seems_rateable/small.png        | Bin 0 -> 427 bytes
 public/images/seems_rateable/stars.png        | Bin 0 -> 1018 bytes
 .../javascripts/seems_rateable/jRating.js     |   8 +--
 .../javascripts/seems_rateable/rateable.js    |   4 +-
 public/stylesheets/nyan.css                   |  50 ++++++++++++++++++
 17 files changed, 98 insertions(+), 38 deletions(-)
 create mode 100644 app/controllers/ratings_controller.rb
 rename db/migrate/{20130806083151_create_seems_rateable_rates.rb => 20140421044829_create_seems_rateable_rates.rb} (100%)
 rename db/migrate/{20130806083152_create_seems_rateable_cached_ratings.rb => 20140421044830_create_seems_rateable_cached_ratings.rb} (100%)
 delete mode 100644 lib/plugins/seems_rateable-master/app/controllers/seems_rateable/ratings_controller.rb
 create mode 100644 public/images/seems_rateable/bg_jRatingInfos.png
 create mode 100644 public/images/seems_rateable/small.png
 create mode 100644 public/images/seems_rateable/stars.png
 rename app/assets/javascripts/rateable/jRating.js.erb => public/javascripts/seems_rateable/jRating.js (94%)
 rename app/assets/javascripts/rateable/rateable.js.erb => public/javascripts/seems_rateable/rateable.js (93%)

diff --git a/Gemfile b/Gemfile
index 63dd32df..b20c8653 100644
--- a/Gemfile
+++ b/Gemfile
@@ -6,6 +6,7 @@ unless RUBY_PLATFORM =~ /w32/
   gem 'rubyzip'
   gem 'zip-zip'
 end
+gem 'seems_rateable'
 gem "rails", "3.2.13"
 gem "jquery-rails", "~> 2.0.2"
 gem "i18n", "~> 0.6.0"
diff --git a/Gemfile.lock b/Gemfile.lock
index d60847b1..40caae26 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -75,10 +75,13 @@ GEM
       rake (>= 0.8.7)
       rdoc (~> 3.4)
       thor (>= 0.14.6, < 2.0)
-    rake (10.0.4)
+    rake (10.1.0)
     rdoc (3.12.2)
       json (~> 1.4)
     ruby-openid (2.1.8)
+    seems_rateable (1.0.13)
+      jquery-rails
+      rails
     sprockets (2.2.2)
       hike (~> 1.2)
       multi_json (~> 1.0)
@@ -109,3 +112,4 @@ DEPENDENCIES
   rails (= 3.2.13)
   rdoc (>= 2.4.2)
   ruby-openid (~> 2.1.4)
+  seems_rateable
diff --git a/app/controllers/ratings_controller.rb b/app/controllers/ratings_controller.rb
new file mode 100644
index 00000000..5ae478af
--- /dev/null
+++ b/app/controllers/ratings_controller.rb
@@ -0,0 +1,15 @@
+require_dependency "seems_rateable/application_controller"
+
+class RatingsController < ::ApplicationController
+	def create
+		raise NoCurrentUserInstanceError unless current_user
+		
+		obj = params[:kls].classify.constantize.find(params[:idBox])
+		begin
+			obj.rate(params[:rate].to_i, current_user.id, params[:dimension])
+			render :json => true
+		rescue Errors::AlreadyRatedError
+			render :json => {:error => true}
+		end
+	end
+end
diff --git a/app/models/softapplication.rb b/app/models/softapplication.rb
index 71caf059..205ede48 100644
--- a/app/models/softapplication.rb
+++ b/app/models/softapplication.rb
@@ -1,6 +1,8 @@
 class Softapplication < ActiveRecord::Base
   attr_accessible :android_min_version_available, :app_type_id, :app_type_name, :description, :name, :user_id, :contest_id, :application_developers
   acts_as_attachable
+  seems_rateable :allow_update => true, :dimensions => :quality
+
 
   has_many :journals_for_messages, :as => :jour, :dependent => :destroy
   has_many :contesting_softapplications, :dependent => :destroy
diff --git a/app/views/layouts/base.html.erb b/app/views/layouts/base.html.erb
index fe42d00e..17109b25 100644
--- a/app/views/layouts/base.html.erb
+++ b/app/views/layouts/base.html.erb
@@ -10,6 +10,7 @@
 <%= stylesheet_link_tag 'jquery/jquery-ui-1.9.2', 'application', 'nyan', :media => 'all' %>
 <%= stylesheet_link_tag 'rtl', :media => 'all' if l(:direction) == 'rtl' %>
 <%= javascript_heads %>
+<%= javascript_include_tag 'seems_rateable/jRating', 'seems_rateable/rateable'%> 
 <%= heads_for_theme %>
 <%= call_hook :view_layouts_base_html_head %>
 <!-- page specific tags -->
diff --git a/app/views/softapplications/show.html.erb b/app/views/softapplications/show.html.erb
index 047ecf8d..76483c7c 100644
--- a/app/views/softapplications/show.html.erb
+++ b/app/views/softapplications/show.html.erb
@@ -36,6 +36,10 @@
 
 					<td>开发人员：<%= @softapplication.application_developers %></td>
 				</tr>
+                <tr>
+                  <td>平均评分: <%= rating_for @softapplication, :static => true, dimension: :quality, class: 'rateable div_inline' %></td>
+                  <td></td>
+                </tr>
 
 	
 			</table>
@@ -64,7 +68,7 @@
 
 <div style="height: 50px">
 	<div style="font-size: 15px"><strong>软件评论：</strong></div>
-	<div></div>
+	<div>评分: <%= rating_for @softapplication, dimension: :quality, class: 'rateable div_inline' %></div>
 </div>
 
 <!--提示登录后对应用进行评价-->
diff --git a/config/routes.rb b/config/routes.rb
index 17e09f5a..54d9124f 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -16,6 +16,7 @@
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
 RedmineApp::Application.routes.draw do
+  resources :ratings, :only => :create
   namespace :zipdown do
     match 'assort'
   end
@@ -506,18 +507,6 @@ RedmineApp::Application.routes.draw do
   match 'upload_avatar', :to => 'avatar#upload', :via => :post 
   # Endof Tao's code
   get 'robots.txt', :to => 'welcome#robots'
-
-  Dir.glob File.expand_path("plugins/*", Rails.root) do |plugin_dir|
-    file = File.join(plugin_dir, "config/routes.rb")
-    if File.exists?(file)
-      begin
-        instance_eval File.read(file)
-      rescue Exception => e
-        puts "An error occurred while loading the routes definition of #{File.basename(plugin_dir)} plugin (#{file}): #{e.message}."
-        exit 1
-      end
-    end
-  end
   
   ##############测试留言功能    fq
   post 'words/new', :to => 'words#new'
@@ -607,5 +596,16 @@ RedmineApp::Application.routes.draw do
   
   match 'words/add_brief_introdution', :controller => 'words', :action => 'add_brief_introdution'
 
+  Dir.glob File.expand_path("plugins/*", Rails.root) do |plugin_dir|
+    file = File.join(plugin_dir, "config/routes.rb")
+    if File.exists?(file)
+      begin
+        instance_eval File.read(file)
+      rescue Exception => e
+        puts "An error occurred while loading the routes definition of #{File.basename(plugin_dir)} plugin (#{file}): #{e.message}."
+        exit 1
+      end
+    end
+  end
   get ':controller(/:action(/:id))'
 end
diff --git a/db/migrate/20130806083151_create_seems_rateable_rates.rb b/db/migrate/20140421044829_create_seems_rateable_rates.rb
similarity index 100%
rename from db/migrate/20130806083151_create_seems_rateable_rates.rb
rename to db/migrate/20140421044829_create_seems_rateable_rates.rb
diff --git a/db/migrate/20130806083152_create_seems_rateable_cached_ratings.rb b/db/migrate/20140421044830_create_seems_rateable_cached_ratings.rb
similarity index 100%
rename from db/migrate/20130806083152_create_seems_rateable_cached_ratings.rb
rename to db/migrate/20140421044830_create_seems_rateable_cached_ratings.rb
diff --git a/db/schema.rb b/db/schema.rb
index bfbb7a26..3918413f 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -11,7 +11,7 @@
 #
 # It's strongly recommended to check this file into your version control system.
 
-ActiveRecord::Schema.define(:version => 20140417091429) do
+ActiveRecord::Schema.define(:version => 20140421044830) do
 
   create_table "activities", :force => true do |t|
     t.integer "act_id",   :null => false
diff --git a/lib/plugins/seems_rateable-master/app/controllers/seems_rateable/ratings_controller.rb b/lib/plugins/seems_rateable-master/app/controllers/seems_rateable/ratings_controller.rb
deleted file mode 100644
index afc47d5e..00000000
--- a/lib/plugins/seems_rateable-master/app/controllers/seems_rateable/ratings_controller.rb
+++ /dev/null
@@ -1,17 +0,0 @@
-require_dependency "seems_rateable/application_controller"
-
-module SeemsRateable
-  class RatingsController < ::ApplicationController
-    def create
-		 raise NoCurrentUserInstanceError unless current_user
-		 
-		 obj = params[:kls].classify.constantize.find(params[:idBox])
-		 begin
-			obj.rate(params[:rate].to_i, current_user.id, params[:dimension])
-			render :json => true
-		 rescue Errors::AlreadyRatedError
-			render :json => {:error => true}
-		 end
-	 end
-  end
-end
diff --git a/public/images/seems_rateable/bg_jRatingInfos.png b/public/images/seems_rateable/bg_jRatingInfos.png
new file mode 100644
index 0000000000000000000000000000000000000000..af5bf556e15c884bc24c0ab00537123d373bbcc9
GIT binary patch
literal 572
zcmV-C0>k}@P)<h;3K|Lk000e1NJLTq003J6001Hg1^@s6FdL<i0000PbVXQnQ*UN;
zcVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBUz-bqA3RCwC#noVxPFc5_&6T=N6MPgBL
zhKjq;u6hilR;}72&~+tN-B2!34pKHC%8yt>V!IyWhyxINQN4+b0cZ8;>G@@1HMkvg
zce~v)5k0ukBUEc;t(9r%=82o%)PBEzW#-ZNee4$xhXYkr1yWbm>2#vS&w{4YX-{kY
zXpG6T{!M=~yc-r}S<>ulM(g#O+#+aQSy`4*r_-UjuKlR$YO5%tV)MJ9`S;v|Zf-<f
zU*ZsXo;N%Tl{wnZv;6?%IKC}h<x=uR8%@qr06U_k$WRS+fQ}2>Ar7!Jz)q)Zz>W|5
z?AaV(GpIy^O`fmfplXJ)qtX_<lCxnWNF)CeHd8ZD5j|TrNblK>Gc%MO5w~LuWhY{7
zFKL94MxvG#zCLGj$k_~K#}l@7J{{5sA^N3BBe0P~Hgf5WV1taSZ0i$=l1So}jp!Fo
z+4juWM?XR%D!Q_L^h1j^(FRHK@_+z41#ChZNuEYHbp7DjNjw`5H7Ooy@WMBpXE*0Y
z<m3)u$Ao<buH?sRxdQB%8)TT3CA&4o6dbyLsCG+Eni*{b`BqtLKb(z>IA<46n83R|
zHOo0aU28g3NBL_ap8eurclA-<yTuZi+5~RpLyiW2Dy5$O1Q-A#?3hWbk`d?t0000<
KMNUMnLSTZaF#Ur7

literal 0
HcmV?d00001

diff --git a/public/images/seems_rateable/small.png b/public/images/seems_rateable/small.png
new file mode 100644
index 0000000000000000000000000000000000000000..de1826f59daa975bbb5712b11672b65705a35ac1
GIT binary patch
literal 427
zcmV;c0aX5pP)<h;3K|Lk000e1NJLTq000aC000UI1^@s6fGofI0000PbVXQnQ*UN;
zcVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBUzO-V#SRCwB4QOiohKop%<3V|k0t=N~M
zF2tn^_qq|$k96lka4G(R;0L&Ct+<lBn#Uw$lFp1bt<lm02ZnR!p8G<^nA)tNTY8@N
zQkG@Br8lSvLWrU@aKk(=;;Jg1(=>hC)PLWUpbaRcbdp3*ocB+SQLkB+eWNX45a&|L
zu&Sy#RGvCc7gK8W5i+F^S+rcLv1N5mEXz8!ZTo=Lb(JMact4pO?rDw2V8Ve6ytM1`
zF2*=0isT`V<2y(=!p%U?uP;RU$ocL$A;bZ$%4@Bal;yh+VmKO&Z$US!i0iuhj9J$Z
z7mP6iL=7pWswnc_U@*LCP1xTsm=H?Afe;N`fMmlQ3|cb4c1!;WbuB|<I(`%dODU@f
zA$Y<0P7ICZH2|u0ntx3l)m+5)gRklI(_yT03H@I5di^WU3(sb=j{uICwVVGDU;yT7
V$mA5D`{w`v002ovPDHLkV1jWMy|n-U

literal 0
HcmV?d00001

diff --git a/public/images/seems_rateable/stars.png b/public/images/seems_rateable/stars.png
new file mode 100644
index 0000000000000000000000000000000000000000..2df62b02630716108f1c112e4b4b81d2c259d61a
GIT binary patch
literal 1018
zcmV<W0|oqvP)<h;3K|Lk000e1NJLTq000*N000yS1^@s6X1=Bl0000PbVXQnQ*UN;
zcVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBU#oJmAMRCwB~R9$b|R2cU0SK>HM>?Bi4
zQQNc?)dFe-Ef-bQX@N~}3lhHoY1iCvv!Ag`?hpcQxR?;)el&EOMn_dx$D(xoP}4Mt
z+kDtfZO8U8kK3jj+e9O6M>>i9`kd#y@AEw8B>@IAz-TlY-wA?{&@}BcX28J?vdDGa
zt#bLvubZ3YUnr%`Hwhl>?CktFKK?eNC{m|ZtNrxGz>klu)p~vJZ$;5E+3aw-RQjig
zN-D1n4msR%x%9)t#JK2rj7TYwa=B5uwYBwa`1!TKbzQ&BF#et_D@n*s7>2OvbVh5n
z4%Q9BSh@(D^xfilUcJ}rRc+he?{>S}&1Q4kvbvS2sdp5P6Xd?9Se7u3V;QAV+19kw
zXfm11$+Db_Mx#S;(=gBTnRD>{{r&GD*b2|Hrteb|3oKPlu*sw<Mj{avvH022XBm-`
zLk!2UjaI8=x7!Be`+kh$xP<5V@yW@_E168@b3PuAPgW|sKNkuMo+K$Mtad2~2#-uz
z-v<|j4G1AG@EZ_HnS>xjlx+5`U}$K_<2bgf>$Td-%3sNunVG3`T0p~}%gc9e&CY%x
zh@z~7{Icwc9AY>DF5sU#6VVT?kJ$?ar!-(Vj-iIpY(IMRL@X3OzA1|0_<uO>bUMEm
zi+8?RSeTatK}us&5}+~;;V|(?*i!?Y4pivj*8~-YX}0wT5B><QU;p&$SS<G5OKyQM
zi;Ig_zg$`>9$VHC07)VQ#sI%;fa&9zVg{!%jz>&2j22y9zUu?{tLK4VvZAW0AI;BS
z`C?<EtOMK*sX@jeICFLg(~p7UP*`hy{c-!+wNGvU`27ogo=R!6j^lEa`gR}eRWm#Q
zYb>x8NhA_;16?9qZ8Roo^E@X!vmQCGp#K~W*jBXd<1TDy4g~HvPDc<p9~p^fT2o-*
zJ#e6>6TbJmG}Z{X9~224yb7FuF<@Dij@uUc9GNnH5O^KKXdgU%x^1Bvf<7Zhqp=JQ
zR6-lZ<1&vuHE{m!h2Td=<{?@uDstP^YQ4U@Tj_y-(R@B%K!(o4hiktH0@*+VlW+?!
z$+Cn!M|wJ)zBuznqrPWZjpo|gV|Qd^;&MJea}^su1kYUP^=vk~h=z8*R4Ntk-Mhb$
zN=aSU<*Q?3WB(71=4Ey|CiOfaKQ}iwuW9NCL{m_96;_O%2tcW$C`xX6dOCf0IJ~*K
ox_XyoyAI+m1Q(vi`&WPg02xTa4XYF-ng9R*07*qoM6N<$g5Sm5VgLXD

literal 0
HcmV?d00001

diff --git a/app/assets/javascripts/rateable/jRating.js.erb b/public/javascripts/seems_rateable/jRating.js
similarity index 94%
rename from app/assets/javascripts/rateable/jRating.js.erb
rename to public/javascripts/seems_rateable/jRating.js
index 4f43a4f9..85612d06 100644
--- a/app/assets/javascripts/rateable/jRating.js.erb
+++ b/public/javascripts/seems_rateable/jRating.js
@@ -12,13 +12,13 @@
 	$.fn.jRating = function(op) {
 		var defaults = {
 			/** String vars **/
-			bigStarsPath : '<%= image_path "seems_rateable/stars.png" %>', // path of the icon stars.png
-			smallStarsPath : '<%= image_path "seems_rateable/small.png" %>', // path of the icon small.png
-			path : '<%= SeemsRateable::Engine.routes.url_helpers.ratings_path %>',
+			bigStarsPath : '/images/seems_rateable/stars.png', // path of the icon stars.png
+			smallStarsPath : '/images/seems_rateable/small.png', // path of the icon small.png
+			path : '/ratings',
 			type : 'big', // can be set to 'small' or 'big'
 
 			/** Boolean vars **/
-			step:false, // if true,  mouseover binded star by star,
+			step: true, // if true,  mouseover binded star by star,
 			isDisabled:false,
 			showRateInfo: false,
 			canRateAgain : false,
diff --git a/app/assets/javascripts/rateable/rateable.js.erb b/public/javascripts/seems_rateable/rateable.js
similarity index 93%
rename from app/assets/javascripts/rateable/rateable.js.erb
rename to public/javascripts/seems_rateable/rateable.js
index da6cc309..e926601d 100644
--- a/app/assets/javascripts/rateable/rateable.js.erb
+++ b/public/javascripts/seems_rateable/rateable.js
@@ -11,7 +11,7 @@ $(document).ready(function(){
          //showRateInfo:false,   //Rate info panel, set true to display
          //rateInfosX : 45,		//In pixel - Absolute left position of the information box during mousemove.
          //rateInfosY : 5,		//In pixel - Absolute top position of the information box during mousemove.
-         path : '<%= SeemsRateable::Engine.routes.url_helpers.ratings_path %>',
+         path : '/ratings',
          onSuccess : function(element, rate){
 				//something like ->
 				//alert('success');
@@ -21,5 +21,5 @@ $(document).ready(function(){
 				$('<span class="text-error"><small style="display:inline-block;">You have already rated!</small></span>').insertAfter(element)
 			}
        });
- 
+
 });
diff --git a/public/stylesheets/nyan.css b/public/stylesheets/nyan.css
index 0d426553..867f7624 100644
--- a/public/stylesheets/nyan.css
+++ b/public/stylesheets/nyan.css
@@ -5,6 +5,9 @@
   -moz-box-sizing: border-box;
   -box-sizing: border-box;
 }
+.div_inline{
+  display: inline-block;
+}
 /*文字不换行*/
 .text_nowrap{
   word-break:keep-all;
@@ -65,7 +68,54 @@
 * {
   font-family: Helvetica, Tahoma, Arial, "Microsoft YaHei", "微软雅黑", SimSun, "宋体", STXihei, "华文细黑", Heiti, "黑体", sans-serif;
 }
+/* 模态窗口
+*******************************************************************************/
+/** jRating CSS **/
 
+/**Div containing the color of the stars */
+
+
+.jRatingAverage {
+    background-color:#f62929;
+    position:relative;
+    top:0;
+    left:0;
+    z-index:2;
+    height:100%;
+}
+.jRatingColor {
+    background-color:#FFD400; /* bgcolor of the stars*/
+    position:relative;
+    top:0;
+    left:0;
+    z-index:2;
+    height:100%;
+}
+
+/** Div containing the stars **/
+.jStar {
+    position:relative;
+    left:0;
+    z-index:3;
+}
+
+/** P containing the rate informations **/
+p.jRatingInfos {
+    position:		absolute;
+    z-index:9999;
+    background:	transparent url('bg_jRatingInfos.png') no-repeat;
+    color:			#CACACA;
+    display:		none;
+    width:			91px;
+    height:			29px;
+    font-size:16px;
+    text-align:center;
+    padding-top:5px;
+}
+p.jRatingInfos span.maxRate {
+    color:#c9c9c9;
+    font-size:14px;
+}
 /* 模态窗口
 *******************************************************************************/