Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh

app/views/contests/_form_contest.html.erb

@@ -67,7 +67,7 @@
   <%= f.text_field :deadline,
                    :required => true,
                    :size => 60,
-                   :style => "width:150px;",
+                   :style => "width:150px;float:left;",
                    :readonly => true,
                    :placeholder => "#{l(:label_deadline)}"
   %>

public/stylesheets/application.css

@@ -3152,6 +3152,18 @@ input[class~='m3p10'], .m3p10 {
 .break_word{word-break: break-all;word-wrap: break-word;}
 .break_word_firefox{white-space: pre-wrap;word-break: break-all;}
 
+/*日历选择图*/
+img.ui-datepicker-trigger {
+    display:block;
+    background:url(/images/public_icon.png) -31px 0 no-repeat;
+    cursor: pointer;
+    vertical-align: middle;
+    margin-left: 5px;
+    margin-top: 5px;
+    width:16px;
+    height:15px;
+    float:left;
+}
 
 /*lizanle 日誌搜索結果樣式*/
 .search_results {