From ba5d831a97436e99f5d79e51e070e922eeeae925 Mon Sep 17 00:00:00 2001
From: jowall <none@none>
Date: Fri, 25 Feb 2011 13:02:52 -0800
Subject: [PATCH] Added preview image to media picker and updated CSS.

--HG--
branch : dev
---
 .../Orchard.MediaPicker.csproj                   |   3 ++-
 .../Styles/images/imagepreview.png               | Bin 0 -> 5412 bytes
 .../{Content => Styles/images}/synchronizing.gif | Bin
 .../Orchard.MediaPicker/Styles/mediapicker.css   |   6 ++++--
 .../Views/Admin/Tab_Gallery.cshtml               |   9 ++++-----
 .../Views/Admin/Tab_Url.cshtml                   |   6 +++---
 6 files changed, 13 insertions(+), 11 deletions(-)
 create mode 100644 src/Orchard.Web/Modules/Orchard.MediaPicker/Styles/images/imagepreview.png
 rename src/Orchard.Web/Modules/Orchard.MediaPicker/{Content => Styles/images}/synchronizing.gif (100%)

diff --git a/src/Orchard.Web/Modules/Orchard.MediaPicker/Orchard.MediaPicker.csproj b/src/Orchard.Web/Modules/Orchard.MediaPicker/Orchard.MediaPicker.csproj
index 67d25862f..a9afb457c 100644
--- a/src/Orchard.Web/Modules/Orchard.MediaPicker/Orchard.MediaPicker.csproj
+++ b/src/Orchard.Web/Modules/Orchard.MediaPicker/Orchard.MediaPicker.csproj
@@ -58,9 +58,10 @@
     <Reference Include="System.Xml.Linq" />
   </ItemGroup>
   <ItemGroup>
-    <Content Include="Content\synchronizing.gif" />
     <Content Include="Scripts\MediaBrowser.js" />
     <Content Include="Scripts\MediaPicker.js" />
+    <Content Include="Styles\images\imagepreview.png" />
+    <Content Include="Styles\images\synchronizing.gif" />
     <Content Include="Styles\mediapicker.css" />
     <Content Include="Views\Web.config" />
     <Content Include="Scripts\Web.config" />
diff --git a/src/Orchard.Web/Modules/Orchard.MediaPicker/Styles/images/imagepreview.png b/src/Orchard.Web/Modules/Orchard.MediaPicker/Styles/images/imagepreview.png
new file mode 100644
index 0000000000000000000000000000000000000000..27b08034362d9342d42687bcf3a3f56cebf59ebb
GIT binary patch
literal 5412
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

literal 0
HcmV?d00001

diff --git a/src/Orchard.Web/Modules/Orchard.MediaPicker/Content/synchronizing.gif b/src/Orchard.Web/Modules/Orchard.MediaPicker/Styles/images/synchronizing.gif
similarity index 100%
rename from src/Orchard.Web/Modules/Orchard.MediaPicker/Content/synchronizing.gif
rename to src/Orchard.Web/Modules/Orchard.MediaPicker/Styles/images/synchronizing.gif
diff --git a/src/Orchard.Web/Modules/Orchard.MediaPicker/Styles/mediapicker.css b/src/Orchard.Web/Modules/Orchard.MediaPicker/Styles/mediapicker.css
index db7f096dc..6a13c5043 100644
--- a/src/Orchard.Web/Modules/Orchard.MediaPicker/Styles/mediapicker.css
+++ b/src/Orchard.Web/Modules/Orchard.MediaPicker/Styles/mediapicker.css
@@ -13,7 +13,7 @@ body {
 
 #orchardmediapicker * { font:100% normal Segoe UI,Trebuchet,Arial,Sans-Serif; }
 
-#orchardmediapicker #tabs { padding: 0 0 24px 0; }
+#orchardmediapicker #tabs { padding: 0 0 12px 0; }
 
 #orchardmediapicker a, #orchardmediapicker a:link, #orchardmediapicker a:visited, #orchardmediapicker a:hover, #orchardmediapicker a:active, #orchardmediapicker a:focus {
     color:#1e5d7d;
@@ -111,9 +111,11 @@ fieldset          { padding:0; margin: 0; border: 0px solid #dbdbdb; }
 #orchardmediapicker label.forcheckbox { display: inline; margin: 10px 0 0 4px; }
 #orchardmediapicker .actions { margin:12px 0 0 0; clear:both; text-align:left; }
 
+#orchardmediapicker .text-box {width:90%;}
+
 .image-width, .image-height {float:left; width:90px;}
 
-.image-width .text-box, .image-height .text-box {width:60%;}
+#orchardmediapicker .image-width .text-box, #orchardmediapicker .image-height .text-box, #orchardmediapicker #folderName {width:60%;}
 
 
 .clearboth {
diff --git a/src/Orchard.Web/Modules/Orchard.MediaPicker/Views/Admin/Tab_Gallery.cshtml b/src/Orchard.Web/Modules/Orchard.MediaPicker/Views/Admin/Tab_Gallery.cshtml
index b456a51c4..75f0c505a 100644
--- a/src/Orchard.Web/Modules/Orchard.MediaPicker/Views/Admin/Tab_Gallery.cshtml
+++ b/src/Orchard.Web/Modules/Orchard.MediaPicker/Views/Admin/Tab_Gallery.cshtml
@@ -27,8 +27,8 @@
             </p>
 			<fieldset>
 				<input id="__requesttoken" type="hidden" value="@Html.AntiForgeryTokenValueOrchard()" />
-				<input id="folderName" type="text" />
-				<input type="button" id="createFolder" value="@T("Create Folder")" />
+				<input class="text-box" id="folderName" type="text" />
+				<input class="button" type="button" id="createFolder" value="@T("Create Folder")" />
 			</fieldset>
         </div>
         <fieldset>
@@ -66,11 +66,10 @@
                 <input type="hidden" name="MediaPath" value="@Model.MediaPath" />
                 <label for="fileUpload">@T("Upload an image from your computer")</label>
                 <input type="file" name="fileUpload" id="fileUpload"  />
-                <input type="submit" id="upload" value="Upload" />
+                <input class="button" type="submit" id="upload" value="Upload" />
                 }
             }
-			<img id="lib-indicator" src="@Url.Content("~/modules/orchard.mediapicker/content/synchronizing.gif")" alt="" class="throbber" />
-
+            <img id="img-indicator" src="@Url.Content("~/modules/orchard.mediapicker/Styles/images/synchronizing.gif")" alt="" class="throbber" />
 
         </fieldset>
 
diff --git a/src/Orchard.Web/Modules/Orchard.MediaPicker/Views/Admin/Tab_Url.cshtml b/src/Orchard.Web/Modules/Orchard.MediaPicker/Views/Admin/Tab_Url.cshtml
index 5840aeb70..ae32d3d06 100644
--- a/src/Orchard.Web/Modules/Orchard.MediaPicker/Views/Admin/Tab_Url.cshtml
+++ b/src/Orchard.Web/Modules/Orchard.MediaPicker/Views/Admin/Tab_Url.cshtml
@@ -15,7 +15,7 @@
         <div id="image-preview">
             <img alt="" id="img-loader" style="display:none" src="" />
             <div class="media-largepreview">
-                <img alt="@T("Preview of Image")" id="img-preview" src="TODO: some placeholder image" onload="jQuery.mediaPicker.scalePreview(this)" />
+                <img alt="@T("Preview of Image")" id="img-preview" src="@Url.Content("~/modules/orchard.mediapicker/Styles/images/imagepreview.png")" onload="jQuery.mediaPicker.scalePreview(this)" />
             </div>
             <div>
                 <label for="img-src">@T("URL for the image resource")</label>
@@ -26,9 +26,9 @@
                     <input type="hidden" name="MediaPath" value="@mediaPath" />
                     <label for="fileUpload">@T("Upload an image from your computer")</label>
                     <input type="file" name="fileUpload" id="fileUpload"  />
-                    <input type="submit" id="upload" value="Upload" />
+                    <input class="button" type="submit" id="upload" value="Upload" />
                 }
-				<img id="img-indicator" src="@Url.Content("~/modules/orchard.mediapicker/content/synchronizing.gif")" alt="" class="throbber" />
+				<img id="img-indicator" src="@Url.Content("~/modules/orchard.mediapicker/Styles/images/synchronizing.gif")" alt="" class="throbber" />
             </div>
 
         </div>