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 1 Packages Projects Releases Wiki Activity

Merge

Browse Source 
--HG--
branch : dev
This commit is contained in:
Andre Rodrigues
2011-02-22 11:18:51 -08:00
parent 083691a37c 943a446762
commit 8456603188
4 changed files with 12 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/Orchard.Web/Modules/Orchard.MediaPicker/Scripts/MediaPicker.js
View File

@@ -20,7 +20,7 @@
+ "&callback=" + callbackName + "&callback=" + callbackName
+ "&editmode=" + (!!(data.img && data.img.src)) + "&editmode=" + (!!(data.img && data.img.src))
+ "&" + (new Date() - 0); + "&" + (new Date() - 0);
var w = window.open(url, "_blank", data.windowFeatures || "width=800,height=600,status=no,toolbar=no,location=no,menubar=no,resizable=no"); var w = window.open(url, "_blank", data.windowFeatures || "width=685,height=540,status=no,toolbar=no,location=no,menubar=no,resizable=no");
if (w.jQuery && w.jQuery.mediaPicker) { if (w.jQuery && w.jQuery.mediaPicker) {
w.jQuery.mediaPicker.init(data); w.jQuery.mediaPicker.init(data);
} }

11
src/Orchard.Web/Modules/Orchard.MediaPicker/Views/Admin/Index.cshtml
View File

@@ -5,16 +5,17 @@
@using Orchard.Media.Models; @using Orchard.Media.Models;
@using Orchard.UI.Resources; @using Orchard.UI.Resources;
@{ @{
Style.Include("~/themes/theadmin/styles/site.css");
Style.Include("~/themes/theadmin/styles/ie.css").UseCondition("lte IE 8").SetAttribute("media", "screen, projection");
Style.Include("~/themes/theadmin/styles/ie6.css").UseCondition("lte IE 6").SetAttribute("media", "screen, projection");
Style.Include("mediapicker.css");
// these need to be in the head because MediaBrowser.js defines a callback that the thumbnail images call when they load, // these need to be in the head because MediaBrowser.js defines a callback that the thumbnail images call when they load,
// which could happen as soon as they render. // which could happen as soon as they render.
Style.Require("jQueryUI_Orchard").AtHead(); Style.Require("jQueryUI_Orchard").AtHead();
Script.Require("jQueryUI_Tabs").AtHead(); Script.Require("jQueryUI_Tabs").AtHead();
Script.Include("MediaBrowser.js").AtHead(); Script.Include("MediaBrowser.js").AtHead();
Style.Include("~/themes/theadmin/styles/site.css");
Style.Include("~/themes/theadmin/styles/ie.css").UseCondition("lte IE 8").SetAttribute("media", "screen, projection");
Style.Include("~/themes/theadmin/styles/ie6.css").UseCondition("lte IE 6").SetAttribute("media", "screen, projection");
Style.Include("mediapicker.css");
} }
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<html xmlns="http://www.w3.org/1999/xhtml"> <html xmlns="http://www.w3.org/1999/xhtml">

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

@@ -115,12 +115,12 @@
<li class="group"> <li class="group">
<div class="image-width"> <div class="image-width">
<label for="img-width">@T("Width")</label> <label for="lib-width">@T("Width")</label>
<input class="text-box" type="text" id="img-width" />&nbsp;x <input class="text-box" type="text" id="lib-width" />&nbsp;x
</div> </div>
<div class="image-height"> <div class="image-height">
<label for="img-height">@T("Height")</label> <label for="lib-height">@T("Height")</label>
<input class="text-box" type="text" id="img-height" /> <input class="text-box" type="text" id="lib-height" />
</div> </div>
</li> </li>

2
src/Orchard.Web/Themes/TheAdmin/Views/Layout.cshtml
View File

@@ -6,7 +6,7 @@
@using Orchard.ContentManagement; @using Orchard.ContentManagement;
@{ @{
Style.Include("site.css"); Style.Include("site.css?v=1.1");
Style.Include("ie.css").UseCondition("lte IE 8").SetAttribute("media", "screen, projection"); Style.Include("ie.css").UseCondition("lte IE 8").SetAttribute("media", "screen, projection");
Style.Include("ie6.css").UseCondition("lte IE 6").SetAttribute("media", "screen, projection"); Style.Include("ie6.css").UseCondition("lte IE 6").SetAttribute("media", "screen, projection");
Script.Require("jQuery"); Script.Require("jQuery");