Merge remote-tracking branch 'christian/SAKIII-5374' into SAKIII-5374

gsilver · May 8, 2012 · 3decb06 · 3decb06
2 parents 01e2189 + 27e22ba
commit 3decb06
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 10 deletions.
diff --git a/devwidgets/entity/javascript/entity.js b/devwidgets/entity/javascript/entity.js
@@ -579,6 +579,7 @@ require(["jquery", "sakai/sakai.api.core"], function($, sakai) {
                     saveRef: "",
                     showByDefault: true
                 });
+                $('#content_profile_preview_versions_container').show();
                 $('#entity_contentsettings_dropdown').jqmHide();
             });
 

diff --git a/devwidgets/versions/css/versions.css b/devwidgets/versions/css/versions.css
@@ -90,10 +90,6 @@
 .versions_widget #versions_container ul li:hover .versions_updater {
     color: #fff;
 }
-.versions_widget #versions_container ul li:hover .s3d-button {
-    visibility: visible;
-    margin-top: 5px;
-}
 .versions_widget #versions_container ul li.versions_selected {
     background: url("/devwidgets/versions/images/versions_hover_bg.png") repeat-x scroll left top transparent;
     color: #fff;
@@ -104,10 +100,6 @@
 .versions_widget #versions_container ul li.versions_divider {
     border-right: 1px solid #dadad9;
 }
-.versions_widget #versions_container ul li.versions_selected .s3d-button {
-    visibility: visible;
-    margin-top: 5px;
-}
 .versions_widget #versions_container ul li .versions_date {
     display: block;
     clear: both;
@@ -132,8 +124,8 @@
     font-size: 9px;
 }
 .versions_widget #versions_container ul li .s3d-button {
-    visibility: hidden;
     display: block;
+    margin-top: 5px;
 }
 .versions_widget #versions_container.versions_without_left_hand_nav ul li {
     width: 123px;

diff --git a/devwidgets/versions/versions.html b/devwidgets/versions/versions.html
@@ -29,7 +29,7 @@
                         {if !sakai_global.content_profile || sakai_global.content_profile.content_data.data.mimeType == "x-sakai/document"}
                             <button type="button" class="s3d-button s3d-header-button s3d-header-smaller-button versions_restore_version">__MSG__RESTORE__</button>
                         {else}
-                            <a href="${currentPage.pageSavePath|safeOutput}.version.,${version.versionId|safeOutput},/${version["sakai:pooled-content-file-name"]|safeOutput}" target="_blank" class="s3d-button s3d-header-button s3d-header-smaller-button">
+                            <a href="${currentPage.pageSavePath|safeOutput}.version.,${version.versionId|safeOutput},{if version["sakai:pooled-content-file-name"]}/${version["sakai:pooled-content-file-name"]|safeOutput}{/if}" target="_blank" class="s3d-button s3d-header-button s3d-header-smaller-button">
                                 __MSG__DOWNLOAD__
                             </a>
                         {/if}