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

app/helpers/application_helper.rb

@@ -1300,10 +1300,10 @@ module ApplicationHelper
         start_of_week = start_of_week.to_i % 7
 
         tags = javascript_tag(
-                   "var datepickerOptions={dateFormat: 'yy-mm-dd', firstDay: #{start_of_week}, " +
+                   "var datepickerOptions={dateFormat: 'yy-mm-dd',minDate: new Date(), firstDay: #{start_of_week}, " +
                      "showOn: 'button', buttonImageOnly: true, buttonImage: '" + 
                      path_to_image('/images/calendar.png') +
-                     "', showButtonPanel: true, showWeek: true, showOtherMonths: true, selectOtherMonths: true};")
+                     "', showButtonPanel: true, showWeek: true, showOtherMonths: true, selectOtherMonths: true, onClose: function(dateText, inst) {TimeClose(dateText,inst);}, beforeShow : function(input){TimeBeforeShow(input);} };")
         jquery_locale = l('jquery.locale', :default => current_language.to_s)
         unless jquery_locale == 'en'
           tags << javascript_include_tag("i18n/jquery.ui.datepicker-#{jquery_locale}.js") 

app/views/admin/projects.html.erb

@@ -17,7 +17,7 @@
  
 
 <div class="autoscroll">
-<table class="list">
+<table class="list" style="width: 100%;table-layout: fixed">
   <thead><tr>
   <th><%=l(:label_project)%></th>
   <th><%=l(:field_is_public)%></th>
@@ -27,7 +27,7 @@
   <tbody>
 <% project_tree(@projects) do |project, level| %>
   <tr class="<%= cycle("odd", "even") %> <%= project.css_classes %> <%= level > 0 ? "idnt idnt-#{level}" : nil %>">
-  <td class="name"><span><%= link_to_project_settings(project, {}, :title => project.short_description) %></span></td>
+  <td style="white-space: nowrap;overflow: hidden;text-overflow: ellipsis;" class="name" title='<%=project.name%>'><span><%= link_to_project_settings(project, {}) %></span></td>
   <td align="center"><%= checked_image project.is_public? %></td>
   <td align="center"><%= format_date(project.created_on) %></td>
   <td class="buttons">

app/views/admin/users.html.erb

@@ -40,13 +40,13 @@
           <th></th>
         </tr>
         </thead>
-        <col style="width: 20%" />
         <col style="width: 10%" />
         <col style="width: 5%" />
-        <col style="width: 20%" />
         <col style="width: 5%" />
-        <col style="width: 15%" />
+        <col style="width: 10%" />
-        <col style="width: 15%" />
+        <col style="width: 5%" />
+        <col style="width: 10%" />
+        <col style="width: 10%" />
         <col style="width: 5%" />
         <col style="width: 5%" />
         <tbody>

app/views/issues/_attributes.html.erb

@@ -46,6 +46,43 @@
 <p><%= f.text_field :estimated_hours, :size => 3, :disabled => !@issue.leaf?, :required => @issue.required_attribute?('estimated_hours') %> <%= l(:field_hours) %></p>
 <% end %>
   <script type="text/javascript">
+//      window.onload=function(){
+//          var img=$("#issue_due_date").next("img");
+//          img.attr("onclick","SetMinValue();");
+//      }
+      function TimeClose(dateText, inst) {
+         if(inst.id=="issue_start_date"){
+             time=dateText;
+         }
+      }
+      var time=new Date();
+      function TimeBeforeShow(input){
+          if(input.id=="issue_due_date"){
+              //var minDate = $(input).datepicker('option', 'minDate');
+              var tempdata=$("#issue_start_date").attr("value");
+
+              $(input).datepicker('option', 'minDate',new Date(tempdata.replace(/-/g,   "/")));
+              //$('.selector').datepicker('option', 'minDate', '12/25/2012');
+          }
+      }
+
+      function SetMinValue(){
+         /// var tempdata=$("#issue_start_date").attr("value");
+          //$('.selector').datepicker('option', 'minDate', '12/25/2012');
+          //alert(tempdata);
+          //$("#issue_due_date").datepicker({
+          //    minDate: new Date(2014,08,23)
+          //var datepickerOptions=
+          //{dateFormat: 'yy-mm-dd',minDate: new Date(2014,08,23), showOn: 'button', buttonImageOnly: true, buttonImage: "path_to_image('/images/calendar.png')", showButtonPanel: true, showWeek: true, showOtherMonths: true, selectOtherMonths: true};
+          //alert( $('.issue_due_date').length);
+          //$('.selector')[1].datepicker('option', 'minDate', new Date(2014, 0 - 8, 23));
+          //$("#issue_due_date").datepicker(datepickerOptions);
+          //$("##{issue_due_date}").datepicker(datepickerOptions);
+          //$("#issue_due_date").datepicker(
+          //        {dateFormat: 'yy-mm-dd',minDate: new Date(2014,08,23), showOn: 'button', buttonImageOnly: true, buttonImage: "path_to_image('/images/calendar.png')", showButtonPanel: true, showWeek: true, showOtherMonths: true, selectOtherMonths: true}
+          //)
+          //});
+      }
       function  PrecentChange(obj){
           var _v=    obj;
           if(_v==100)

app/views/messages/_project_show.html.erb

@@ -161,7 +161,8 @@
 
               <td class="comments">
                 <div class="wiki">
-                  <%= textilizable message, :content, :attachments => message.attachments %>
+                  <%#= textilizable message,:content,:attachments => message.attachments %>
+                  <%= message.content.html_safe  %>
                 </div>
                 <%= link_to_attachments message, :author => false %> </td>
             </tr>