lsm/Orchard
1
0
Fork 0
mirror of https://github.com/OrchardCMS/Orchard.git synced 2025-10-21 19:34:40 +08:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

Added preview image to media picker and updated CSS.

Browse Source 
--HG--
branch : dev
This commit is contained in:
jowall
2011-02-25 13:02:52 -08:00
parent 1e78caba4d
commit ba5d831a97
6 changed files with 13 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/Orchard.Web/Modules/Orchard.MediaPicker/Orchard.MediaPicker.csproj
View File

@@ -58,9 +58,10 @@
<Reference Include="System.Xml.Linq" /> <Reference Include="System.Xml.Linq" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<Content Include="Content\synchronizing.gif" />
<Content Include="Scripts\MediaBrowser.js" /> <Content Include="Scripts\MediaBrowser.js" />
<Content Include="Scripts\MediaPicker.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="Styles\mediapicker.css" />
<Content Include="Views\Web.config" /> <Content Include="Views\Web.config" />
<Content Include="Scripts\Web.config" /> <Content Include="Scripts\Web.config" />

BIN
src/Orchard.Web/Modules/Orchard.MediaPicker/Styles/images/imagepreview.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 5.3 KiB

0
src/Orchard.Web/Modules/Orchard.MediaPicker/Content/synchronizing.gif → src/Orchard.Web/Modules/Orchard.MediaPicker/Styles/images/synchronizing.gif
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.2 KiB

After

Width:  |  Height:  |  Size: 1.2 KiB

6
src/Orchard.Web/Modules/Orchard.MediaPicker/Styles/mediapicker.css
View File

@@ -13,7 +13,7 @@ body {
#orchardmediapicker * { font:100% normal Segoe UI,Trebuchet,Arial,Sans-Serif; } #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 { #orchardmediapicker a, #orchardmediapicker a:link, #orchardmediapicker a:visited, #orchardmediapicker a:hover, #orchardmediapicker a:active, #orchardmediapicker a:focus {
color:#1e5d7d; 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 label.forcheckbox { display: inline; margin: 10px 0 0 4px; }
#orchardmediapicker .actions { margin:12px 0 0 0; clear:both; text-align:left; } #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, .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 { .clearboth {

9
src/Orchard.Web/Modules/Orchard.MediaPicker/Views/Admin/Tab_Gallery.cshtml
View File

@@ -27,8 +27,8 @@
</p> </p>
<fieldset> <fieldset>
<input id="__requesttoken" type="hidden" value="@Html.AntiForgeryTokenValueOrchard()" /> <input id="__requesttoken" type="hidden" value="@Html.AntiForgeryTokenValueOrchard()" />
<input id="folderName" type="text" /> <input class="text-box" id="folderName" type="text" />
<input type="button" id="createFolder" value="@T("Create Folder")" /> <input class="button" type="button" id="createFolder" value="@T("Create Folder")" />
</fieldset> </fieldset>
</div> </div>
<fieldset> <fieldset>
@@ -66,11 +66,10 @@
<input type="hidden" name="MediaPath" value="@Model.MediaPath" /> <input type="hidden" name="MediaPath" value="@Model.MediaPath" />
<label for="fileUpload">@T("Upload an image from your computer")</label> <label for="fileUpload">@T("Upload an image from your computer")</label>
<input type="file" name="fileUpload" id="fileUpload" /> <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> </fieldset>

6
src/Orchard.Web/Modules/Orchard.MediaPicker/Views/Admin/Tab_Url.cshtml
View File

@@ -15,7 +15,7 @@
<div id="image-preview"> <div id="image-preview">
<img alt="" id="img-loader" style="display:none" src="" /> <img alt="" id="img-loader" style="display:none" src="" />
<div class="media-largepreview"> <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>
<div> <div>
<label for="img-src">@T("URL for the image resource")</label> <label for="img-src">@T("URL for the image resource")</label>
@@ -26,9 +26,9 @@
<input type="hidden" name="MediaPath" value="@mediaPath" /> <input type="hidden" name="MediaPath" value="@mediaPath" />
<label for="fileUpload">@T("Upload an image from your computer")</label> <label for="fileUpload">@T("Upload an image from your computer")</label>
<input type="file" name="fileUpload" id="fileUpload" /> <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>
</div> </div>