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

Conflicts:
	public/stylesheets/project.css

app/views/attachments/_project_file_links.html.erb

@@ -1,23 +1,49 @@
 <script type="text/javascript">
     document.addEventListener('DOMContentLoaded',function(){
         var img = document.getElementsByName('issue_attachment_picture');
-        function getImgNaturalStyle(img,callback) {
-            var nWidth, nHeight
-            if (typeof img.naturalWidth == "undefined"|| img.naturalWidth == 0) { // 现代浏览器
+
+
+        function getImgNaturalStyle(img, callback) {
+            var nWidth, nHeight;
+            if (typeof img.naturalWidth == "undefined"|| img.naturalWidth == 0) {
                 var image = new Image();
                 image.src = img.src;
-                nWidth = image.width;
-                nHeight = image.height;
-            } else {
-                nWidth = img.naturalWidth;
-                nHeight = img.naturalHeight;
+                if (image.complete) {
+                    callback(image);
+                } else {
+                    image.onload = function () {
+                        callback(image);
+                        image.onload = null;
+                    };
+                };
+
             }
-            return [nWidth, nHeight]
+            else
+            {
+                if (img.complete) {
+                    nWidth = img.naturalWidth;
+                    nHeight = img.naturalHeight;
+                } else {
+                    img.onload = function () {
+                        nWidth = img.naturalWidth;
+                        nHeight = img.naturalHeight;
+                        image.onload = null;
+                    };
+                };
+
+            }
+            return [nWidth, nHeight];
         }
 
+
+        function UpdateImageInformation(image) {
+            return [image.width,image.height];
+        }
+
+
         for(i=0;i<img.length;i++)
         {
-            imgNatural = getImgNaturalStyle(img[i]);
+            imgNatural = getImgNaturalStyle(img[i],UpdateImageInformation);
             var width = imgNatural[0];
             var height = imgNatural[1];
             if (width<100)
@@ -29,7 +55,10 @@
             }
         }
     });
+
+
 </script>
+
 <div class="attachments" style="font-weight:normal;">
   <% is_float ||= false %>
   <% for attachment in attachments %>

app/views/files/_project_file_new.html.erb

@@ -5,8 +5,8 @@
         $('#ajax-modal').html('<%= escape_javascript(render :partial => 'upload_show_project',:locals => {:project => project}) %>');
         showModal('ajax-modal', '513px');
         $('#ajax-modal').siblings().remove();
-        $('#ajax-modal').before("<span style='float: right;cursor:pointer;padding-left: 513px;'><a href='javascript:void(0)' onclick='closeModal()'><img src='/images/bid/close.png' width='26px' height='26px' /></a></span>")
-        $('#ajax-modal').parent().css("top","40%").css("left","30%");
+        $('#ajax-modal').before("<span style='float: right;cursor:pointer;padding-left: 513px;'><a href='javascript:void(0)' onclick='closeModal()'><img src='/images/bid/close.png' width='26px' height='26px' /></a></span>");
+        $('#ajax-modal').parent().css("top","40%").css("left","36%");
         $('#ajax-modal').parent().addClass("popbox_polls");
     }
 

db/schema.rb

@@ -654,6 +654,16 @@ ActiveRecord::Schema.define(:version => 20150428021035) do
 
   add_index "journal_details", ["journal_id"], :name => "journal_details_journal_id"
 
+  create_table "journal_details_copy", :force => true do |t|
+    t.integer "journal_id",               :default => 0,  :null => false
+    t.string  "property",   :limit => 30, :default => "", :null => false
+    t.string  "prop_key",   :limit => 30, :default => "", :null => false
+    t.text    "old_value"
+    t.text    "value"
+  end
+
+  add_index "journal_details_copy", ["journal_id"], :name => "journal_details_journal_id"
+
   create_table "journal_replies", :id => false, :force => true do |t|
     t.integer "journal_id"
     t.integer "user_id"

public/stylesheets/project.css

@@ -222,7 +222,7 @@ a:hover.ping_sub{ background:#14a8b9;}
 /*.ping_distop span a{ float:right; width:20px; height:20px; background:url(images/star.png) -24px 0 no-repeat; margin-right:3px;}*/
 
 /*上传资源弹出框样式*/
-/*#popbox_polls{width:300px;height:100px;position:fixed !important;z-index:100;left:50%;top:50%;margin:-100px 0 0 -150px;  background:#fff; -moz-border-radius:5px;  -webkit-border-radius:5px;  border-radius:5px; box-shadow:0px 0px 8px #194a81;  overflow:auto;}*/
+.popbox_polls{position:fixed !important;}
 .upload_con h2{ display:block; background:#eaeaea; font-size:14px; color:#343333; height:31px; width: auto;  margin-top:25px; padding-left:20px; padding-top:5px;}
 .upload_box{ width:430px; margin:15px auto;}
 
@@ -433,7 +433,7 @@ span.add_attachment a {padding-left:16px; background: url(../images/bullet_add.p
 /*日历选择图*/
 img.ui-datepicker-trigger {
   display:block;
-  background:url(/images/public_icon.png) -31px 0 no-repeat;	
+  background:url(../images/public_icon.png) -31px 0 no-repeat;
   cursor: pointer;
   vertical-align: middle;
   margin-left: 5px;