From 76ccfe8ac434a902b6784c898de3df06aba2676f Mon Sep 17 00:00:00 2001 From: wanglinchun Date: Fri, 18 Apr 2014 16:35:48 +0800 Subject: [PATCH] fix --- .idea/.generators | 8 + .idea/.name | 1 + .idea/.rakeTasks | 7 + .idea/encodings.xml | 5 + .idea/misc.xml | 5 + .idea/modules.xml | 9 + .idea/scopes/scope_settings.xml | 5 + .idea/trustie2.iml | 65 ++ .idea/vcs.xml | 7 + .idea/workspace.xml | 989 +++++++++++++++++++++ Gemfile.lock | 4 - app/helpers/application_helper.rb | 4 +- app/models/softapplication.rb | 3 +- app/views/layouts/_base_header.html.erb | 4 + app/views/layouts/base_newcontest.html.erb | 1 - app/views/softapplications/show.html.erb | 2 +- public/images/android_0.jpg | Bin 0 -> 1658 bytes 17 files changed, 1110 insertions(+), 9 deletions(-) create mode 100644 .idea/.generators create mode 100644 .idea/.name create mode 100644 .idea/.rakeTasks create mode 100644 .idea/encodings.xml create mode 100644 .idea/misc.xml create mode 100644 .idea/modules.xml create mode 100644 .idea/scopes/scope_settings.xml create mode 100644 .idea/trustie2.iml create mode 100644 .idea/vcs.xml create mode 100644 .idea/workspace.xml create mode 100644 public/images/android_0.jpg diff --git a/.idea/.generators b/.idea/.generators new file mode 100644 index 000000000..48c69bb77 --- /dev/null +++ b/.idea/.generators @@ -0,0 +1,8 @@ + + diff --git a/.idea/.name b/.idea/.name new file mode 100644 index 000000000..2327e6ef0 --- /dev/null +++ b/.idea/.name @@ -0,0 +1 @@ +trustie2 \ No newline at end of file diff --git a/.idea/.rakeTasks b/.idea/.rakeTasks new file mode 100644 index 000000000..212558e83 --- /dev/null +++ b/.idea/.rakeTasks @@ -0,0 +1,7 @@ + + diff --git a/.idea/encodings.xml b/.idea/encodings.xml new file mode 100644 index 000000000..e206d70d8 --- /dev/null +++ b/.idea/encodings.xml @@ -0,0 +1,5 @@ + + + + + diff --git a/.idea/misc.xml b/.idea/misc.xml new file mode 100644 index 000000000..12817166a --- /dev/null +++ b/.idea/misc.xml @@ -0,0 +1,5 @@ + + + + + diff --git a/.idea/modules.xml b/.idea/modules.xml new file mode 100644 index 000000000..eb86c781f --- /dev/null +++ b/.idea/modules.xml @@ -0,0 +1,9 @@ + + + + + + + + + diff --git a/.idea/scopes/scope_settings.xml b/.idea/scopes/scope_settings.xml new file mode 100644 index 000000000..922003b84 --- /dev/null +++ b/.idea/scopes/scope_settings.xml @@ -0,0 +1,5 @@ + + + + \ No newline at end of file diff --git a/.idea/trustie2.iml b/.idea/trustie2.iml new file mode 100644 index 000000000..897cad7ea --- /dev/null +++ b/.idea/trustie2.iml @@ -0,0 +1,65 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/.idea/vcs.xml b/.idea/vcs.xml new file mode 100644 index 000000000..c80f2198b --- /dev/null +++ b/.idea/vcs.xml @@ -0,0 +1,7 @@ + + + + + + + diff --git a/.idea/workspace.xml b/.idea/workspace.xml new file mode 100644 index 000000000..2bb1461a3 --- /dev/null +++ b/.idea/workspace.xml @@ -0,0 +1,989 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + CSS + + + Code style issuesJavaScript + + + Control flow issuesJavaScript + + + JavaScript + + + JavaScript function metricsJavaScript + + + JavaScript validity issuesJavaScript + + + Potentially confusing code constructsJavaScript + + + Ruby + + + SQL + + + + + CoffeeScript + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 1397784941950 + 1397784941950 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Gemfile.lock b/Gemfile.lock index 42cb62272..d60847b17 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -79,9 +79,6 @@ GEM 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) @@ -112,4 +109,3 @@ DEPENDENCIES rails (= 3.2.13) rdoc (>= 2.4.2) ruby-openid (~> 2.1.4) - seems_rateable diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb index cae7b8b1e..1d639726f 100644 --- a/app/helpers/application_helper.rb +++ b/app/helpers/application_helper.rb @@ -1567,7 +1567,8 @@ module ApplicationHelper home_link = link_to l(:field_homepage), {:controller => 'welcome', :action => 'index'} main_course_link = link_to l(:label_course_practice), {:controller => 'welcome', :action => 'index', :host => Setting.course_domain} main_project_link = link_to l(:label_project_deposit), {:controller => 'welcome', :action => 'index', :host => Setting.project_domain} - + main_contest_link = link_to l(:label_contest_innovate), {:controller => 'welcome', :action => 'index', :host => Setting.contest_domain} + course_all_course_link = link_to l(:label_course_all), {:controller => 'projects', :action => 'course', :project_type => 1, :host => Setting.course_domain} course_teacher_all_link = link_to l(:label_teacher_all), {:controller => 'users', :action => 'index', :role => 'teacher', :host => Setting.course_domain} courses_link = link_to l(:label_course_practice), {:controller => 'projects', :action => 'course', :project_type => 1, :host => Setting.course_domain} @@ -1586,6 +1587,7 @@ module ApplicationHelper nav_list.push(main_project_link) if @nav_dispaly_main_project_label nav_list.push(main_course_link) if @nav_dispaly_main_course_label + nav_list.push(main_contest_link) if @nav_dispaly_main_contest_label nav_list.push(courses_link) if @nav_dispaly_course_label nav_list.push(projects_link) if @nav_dispaly_project_label diff --git a/app/models/softapplication.rb b/app/models/softapplication.rb index 603279fbd..71caf059c 100644 --- a/app/models/softapplication.rb +++ b/app/models/softapplication.rb @@ -1,8 +1,7 @@ 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 - seems_rateable_rater + has_many :journals_for_messages, :as => :jour, :dependent => :destroy has_many :contesting_softapplications, :dependent => :destroy belongs_to :user diff --git a/app/views/layouts/_base_header.html.erb b/app/views/layouts/_base_header.html.erb index 4c3884a05..d340ea9e9 100644 --- a/app/views/layouts/_base_header.html.erb +++ b/app/views/layouts/_base_header.html.erb @@ -13,6 +13,10 @@ @nav_dispaly_home_path_label = 1 @nav_dispaly_main_course_label = 1 @nav_dispaly_main_project_label = 1 + @nav_dispaly_main_contest_label = 1 + elsif (realUrl.match(/contest\.trustie\.net\/*/)) + @nav_dispaly_contest_label = 1 + @nav_dispaly_store_all_label = 1 else @nav_dispaly_project_all_label = 1 @nav_dispaly_course_all_label = 1 diff --git a/app/views/layouts/base_newcontest.html.erb b/app/views/layouts/base_newcontest.html.erb index c0e23bf21..190209ae4 100644 --- a/app/views/layouts/base_newcontest.html.erb +++ b/app/views/layouts/base_newcontest.html.erb @@ -10,7 +10,6 @@ <%= favicon %> <%= stylesheet_link_tag 'jquery/jquery-ui-1.9.2', 'application', :media => 'all' %> <%= stylesheet_link_tag 'rtl', :media => 'all' if l(:direction) == 'rtl' %> - <%= seems_rateable_stylesheet %> <%= javascript_heads %> <%= heads_for_theme %> <%= call_hook :view_layouts_base_html_head %> diff --git a/app/views/softapplications/show.html.erb b/app/views/softapplications/show.html.erb index fcd746776..c2cea19b5 100644 --- a/app/views/softapplications/show.html.erb +++ b/app/views/softapplications/show.html.erb @@ -35,7 +35,7 @@ 开发人员：<%= @softapplication.application_developers %> - rate: <%=rating_for @softapplication, :dimension => :qulity %> + diff --git a/public/images/android_0.jpg b/public/images/android_0.jpg new file mode 100644 index 0000000000000000000000000000000000000000..6aadab331ac0ffc74177b2212880d4d221fb0894 GIT binary patch literal 1658 zcmbV}c{tR09LIlinK916B<$|U5k>BCgs2?3b3~LSITJ-q4H_c3_Gx+$GAe4_iglMG zGmJr*EFBoRORizYeKtF@+tWVJ{=pgXWhrR;gvaqC z_ek!Ql2+WWqCC@5^7 zCZE_*NBFrgaXGD6gv7Db$CVU*d2J^a+9$jhxko`~T#?N~`;+Y7fyMnVvhQGjb1?ux z2#C8p2nsL(c6Z8^*5WswiBMW@lM-qb@6bv#+MAmnm}ivxMWby1>tZRzhMPrF`tVwx zW26ntWDC_xlrq5qQYy_Wf*mb`CuH=;PcIf61;>Urp5)uK_#FfR#sc)w?41Cr`a#Ob zfn}E|tLaUT_<|_opBRT4*9_R$<_CnB&N`Eem}Hgm9Car7YWk(mgraRe+b>-`wh=?? zJ2}7LHXGdfG1ZIh_-M@?)wi|9^8tOIWQRVwce|4qE{4_%vU{8~D0dY!-UyrSe8Pw~ z*_)cM((&oJTPbH_*tj_p@DVwD!XyoY^vU}9LjiG)Dw(X+MNoM<8{J*tb!b^A|E92M z7fma8$zEhKWhIP=owd*R^9u?N4Wb>Szp_&vp6M@(#8ML5kA$3wVNGvOq$pQRSN9`X zi;S2xyQ+=Ev1T7H!J!!s`{vS7O7X0u9-nEJk3{O_YYB|YpI@G8L-i=h7qjb`eq${F zetgH65LQknz*ZmS;IPEl7{d9YVb3O;OR)BL8a1MwUvCIiS-J}7*pgL~Jc!xbz8f;s zNaC~eK^%Y|yF$X%tcM|tu*LS+9K4!*-Sf;2UnOQ`hfZagjtp5$KAcD#2@SqCUM*{9nM+~e3*Q@P4uE9r+>rjsVEHL64d*bQt8|4>L|T+P&Z6``RQiTA;UpjjhWlonzRoY!P#Dp?z8m{xmH4qhwesWLXVl6s{FP zcbgC)6C}q>2K`x!Nf?Uj`nsERJPPmZp1op|<9$clOO6~+t@1-kTMt57JYyJx{Wxb* z*VEP_h`;OnRt+cQv{wh$XoZ#NT^O|`McKHkErgtFINj~+fNpYnk)rFr+g+;Fd!meG zq%=-ftw60la8n&sbs8>EsaNt(8#ZrWAT_5OT;9Oi4bMF>4ow-WiD5XjGCHVHmyqHW z0~h+|XS}x(VhMhJB@Jf&zI6?m==z6L>!piC3!l_ZGD;>xWffBMhOIYWnYU3!+oDzB z)I|sOH^&ssMixE{z8XjSx<)%=b!Z{`N2$z{b*^l28Rfu9P^_$m{BGt7!O)h)e3|hK zpKjj3D!+X_FR1=QdTXe6+*GiYU(ASEr!W1UHUC*yz*rhWIZsdo9ZmKU{wlkp`@YF= z!qC%!s^>w?a+CC6?)K-D8PlnbX6sBpEMniIu&%&12bFl?dFqp!hh@|U>+KUKqEjbA zEWOwk4PP-Ns}*D2tts{SU9o`rDF4j8lXs+YJJSMhS@)sc^JxO&<`O62oWVZ;5SHHB literal 0 HcmV?d00001