From 269e1cf49764b060cd2c8675faefa035d6f361e2 Mon Sep 17 00:00:00 2001 From: z9hang Date: Thu, 23 Oct 2014 14:36:10 +0800 Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E7=A9=BA=E6=95=B0=E6=8D=AE=E5=BA=93?= =?UTF-8?q?=E6=83=85=E5=86=B5=E4=B8=8B3=E4=B8=AA=E4=B8=BB=E9=A1=B5?= =?UTF-8?q?=E5=B8=83=E5=B1=80=E4=BF=AE=E6=94=B9=E3=80=822=E3=80=81?= =?UTF-8?q?=E4=B8=8A=E4=BC=A0=E9=99=84=E4=BB=B6=E6=88=90=E5=8A=9F=E6=8F=90?= =?UTF-8?q?=E4=BA=A4=E5=90=8E=E5=85=AC=E5=BC=80=E8=87=AA=E5=8A=A8=E5=8F=98?= =?UTF-8?q?=E6=88=90=E7=A7=81=E6=9C=89=E7=9A=84bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/welcome/contest.html.erb | 8 ++++---- app/views/welcome/course.html.erb | 4 ++-- app/views/welcome/index.html.erb | 4 ++-- public/javascripts/attachments.js | 2 +- public/stylesheets/welcome.css | 18 ++++++++++++++++++ 5 files changed, 27 insertions(+), 9 deletions(-) diff --git a/app/views/welcome/contest.html.erb b/app/views/welcome/contest.html.erb index 8165cfb0a..c5681148e 100644 --- a/app/views/welcome/contest.html.erb +++ b/app/views/welcome/contest.html.erb @@ -152,7 +152,7 @@
-
+

<%=l(:label_current_hot_contest)%>

<% if User.current.logged? %> @@ -193,7 +193,7 @@
-
+

<%=l(:label_notification)%>

@@ -218,7 +218,7 @@
-
+

<%=l(:label_issue_feedback_activities)%> <%= link_to l(:label_my_question), newbie_send_path, {:class => 'orangeButton idea_btn', :style => "color: #EEEEEE" }%> @@ -255,7 +255,7 @@

-
+

<%=l(:label_current_attendingcontest_work)%>

<%= link_to l(:label_more_information), {:controller => 'softapplications', :action => 'index'}, :target => "_blank" %>
diff --git a/app/views/welcome/course.html.erb b/app/views/welcome/course.html.erb index b9eec5014..464d3af4d 100644 --- a/app/views/welcome/course.html.erb +++ b/app/views/welcome/course.html.erb @@ -76,7 +76,7 @@
-
+

<%= l(:lable_hot_course)%>

<% month_now = Time.now.strftime("%m").to_i %> @@ -122,7 +122,7 @@ <% end %>
-
+

<%= l(:label_issue_feedback_activities)%> <%= link_to l(:label_my_question), newbie_send_path, {:class => 'orangeButton idea_btn', :style => "color: #EEEEEE"} %> diff --git a/app/views/welcome/index.html.erb b/app/views/welcome/index.html.erb index 8b610bdbc..b76b14e1d 100644 --- a/app/views/welcome/index.html.erb +++ b/app/views/welcome/index.html.erb @@ -54,7 +54,7 @@
-
+

<%= l(:lable_hot_projects)%>

@@ -107,7 +107,7 @@
-
+

    <%= l(:lable_user_active)%>

    <%= link_to l(:label_more), { :controller => 'users', :action => 'index'}, :target => "_blank" %> diff --git a/public/javascripts/attachments.js b/public/javascripts/attachments.js index 1a1d11363..1504019d7 100644 --- a/public/javascripts/attachments.js +++ b/public/javascripts/attachments.js @@ -24,7 +24,7 @@ function addFile(inputEl, file, eagerUpload) { $('', { 'type': 'text', 'class': 'filename readonly', 'name': 'attachments[' + attachmentId + '][filename]', 'readonly': 'readonly'} ).val(file.name), $('', { 'type': 'text', 'class': 'description', 'name': 'attachments[' + attachmentId + '][description]', 'maxlength': 254, 'placeholder': $(inputEl).data('description-placeholder') } ).toggle(!eagerUpload), $('公开:').attr({ 'class': 'ispublic-label' }) , - $('', { 'type': 'checkbox', 'class': 'is_public_checkbox','value':1, 'name': 'attachments[' + attachmentId + '][is_public]', checked:'checked' } ).toggle(!eagerUpload), + $('', { 'type': 'checkbox', 'class': 'is_public_checkbox','value':1, 'name': 'attachments[' + attachmentId + '][is_public_checkbox]', checked:'checked' } ).toggle(!eagerUpload), $(' ').attr({ 'href': "#", 'class': 'remove-upload', 'data-confirm' : "您确定要删除吗？" }).click(removeFile).toggle(!eagerUpload), $('
    ', { 'class': 'div_attachments', 'name': 'div_'+'attachments_' + attachmentId} ) ).appendTo('#attachments_fields'); diff --git a/public/stylesheets/welcome.css b/public/stylesheets/welcome.css index 227cc6870..6c472bcac 100644 --- a/public/stylesheets/welcome.css +++ b/public/stylesheets/welcome.css @@ -103,6 +103,24 @@ ul.welcome-message-list{ margin-top: 10px; float: left; } + .d-p-index-hot{ + width: 48%; + margin-top: 10px; + float: left; + min-height: 400px; + } + .d-p-index-left{ + width: 48%; + margin-top: 10px; + float: left; + min-height: 200px; + } + .d-p-index-Dynamic{ + width: 48%; + margin-top: 10px; + float: right; + min-height: 200px; + } ul.d-p-index-hdright{ padding: 0px; margin-top: -30px;