lsm/Orchard
1
0
Fork 0
mirror of https://github.com/OrchardCMS/Orchard.git synced 2025-10-15 19:54:57 +08:00
Code Issues Actions 4 Packages Projects Releases Wiki Activity

Merge

Browse Source 
--HG--
branch : dev
This commit is contained in:
Dave Reed
2011-02-16 11:13:36 -08:00
parent c8d7c8c1c8 aefbacd59f
commit 2ef3bae5c2
7 changed files with 30 additions and 36 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

@@ -8,7 +8,6 @@
if (adminIndex === -1) return;
var url = location.href.substr(0, adminIndex)
+ pickerAction + "?source=" + name.substr(eventPrefix.length)
+ "&upload=" + (data.uploadMediaAction || "")
+ "&uploadpath=" + (data.uploadMediaPath || "")
+ "&editmode=" + (!!(data.img && data.img.src))
+ "&editorId=" + data.editorId + "&" + (new Date() - 0);
@@ -31,7 +30,6 @@
// if (adminIndex === -1) return;
// var url = location.href.substr(0, adminIndex)
// + "/Orchard.MediaPicker/MediaPicker/Index?source=" + data.source
// + "&upload=" + data.uploadMediaAction
// + "&editorId=" + data.editorId + "&" + (new Date() - 0);
// var w = window.open(url, "Orchard.MediaPicker", data.windowFeatures || "width=600,height=300,status=no,toolbar=no,location=no,menubar=no");
// // in case it was already open, bring to the fore

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

@@ -8,17 +8,33 @@ input[type="file"] {
{
width: 300px;
height: 300px;
display: table-cell;
text-align: center;
vertical-align: middle;
}
.media-thumbnail
{
width: 200px;
height: 200px;
width: 150px;
height: 150px;
text-align: center;
vertical-align: middle;
padding: 5px;
}
.media-thumbnail img
{
text-align: center;
vertical-align: middle;
display: none; /*revealed by javascript after scaling*/
}
.media-details
{
vertical-align: middle;
}
.media-details ul
{
list-style-type: none
}
.media-folder
{
}
.selected
{

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

@@ -8,7 +8,6 @@
// querystring values need to persist after a new GET when clicking on the media browser's
// folders for navigation.
@Html.ActionLink(folderName, "Index", null, null, null, "tab=1", new {
upload = Request["upload"],
uploadpath = Request["uploadpath"],
editmode = Request["editmode"],
source = Request["source"],
@@ -17,11 +16,7 @@
mediaPath = mediaPath }, null);
}
@{
// only allow uploading to a local url
var uploadAction = Request["upload"];
if (!Url.IsLocalUrl(uploadAction)) {
uploadAction = "";
}
var uploadAction = Url.Action("AddFromClient", "Admin", new { area = "Orchard.Media" });
}
<div style="float:left">
@@ -41,10 +36,8 @@
<table class="items" summary="@T("This is a table of the images currently available for use in your application.")">
@foreach (var mediaFolder in Model.MediaFolders) {
<tr>
<td>
<td class="media-folder" colspan="2">
<img src="@Href("~/Modules/Orchard.Media/Content/Admin/images/folder.gif")" height="16" width="16" class="mediaTypeIcon" alt="@T("Folder")" />
</td>
<td>
@FolderLink(mediaFolder.Name, mediaFolder.MediaPath)
</td>
</tr>
@@ -52,12 +45,10 @@
@foreach (var mediaFile in Model.MediaFiles) {
var src = (((IMediaService)ViewData["Service"]).GetPublicUrl(Path.Combine(Model.MediaPath, mediaFile.Name)));
<tr data-imgsrc="@src" class="media-item">
<td>
<div class="media-thumbnail">
<img data-filename="@src.Substring(src.LastIndexOf("/") + 1)" alt="" src="@src" onload="jQuery.mediaPicker.scalePreview(this)" />
</div>
<td class="media-thumbnail">
<img data-filename="@src.Substring(src.LastIndexOf("/") + 1)" alt="" src="@src" onload="jQuery.mediaPicker.scalePreview(this)" />
</td>
<td>
<td class="media-details">
<ul class="media-summary">
<li><a class="media-filename" href="@src" target="_blank">@mediaFile.Name</a></li>
<li>@T("Added on"): @mediaFile.LastUpdated</li>
@@ -123,10 +114,3 @@
<input type="button" id="lib-insert" value="@T("Insert")" class="disabled" data-edittext="@T("Update")" />
</fieldset>
</div>

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

@@ -5,11 +5,8 @@
@using Orchard.Media.Models;
@using Orchard.UI.Resources;
@{
// only allow uploading to a local url
var uploadAction = Request["upload"];
if (!Url.IsLocalUrl(uploadAction)) {
uploadAction = "";
}
var uploadAction = Url.Action("AddFromClient", "Admin", new { area = "Orchard.Media" });
// media directory to save uploaded files into
var mediaPath = Request["uploadpath"];
if (!Url.IsLocalUrl(mediaPath)) {
mediaPath = "";

5
src/Orchard.Web/Modules/TinyMce/Scripts/plugins/mediapicker/editor_plugin.js
View File

@@ -1,2 +1,3 @@
(function(){tinymce.create("tinymce.plugins.Orchard.MediaPicker",{init:function(b,d){b.addCommand("mceMediaPicker",function(){b.focus();var c,a=b.selection.getContent();if(a){a=a.replace(/\<IMG/gi,"<editimg");a=$(a).filter("editimg");if(a.length)c={src:a.attr("src"),"class":a.attr("class"),style:a.css("cssText"),alt:a.attr("alt"),width:a.attr("width"),height:a.attr("height"),align:a.attr("align")}}OpenAjax.hub.publish("orchard.admin.pickimage-open.tinymce",{editorId:b.id,img:c,uploadMediaAction:b.getParam("mediapicker_uploadaction"),
uploadMediaPath:b.getParam("mediapicker_uploadpath")})});b.addButton("mediapicker",{title:b.getParam("mediapicker_title"),cmd:"mceMediaPicker",image:d+"/img/picture_add.png"})},createControl:function(){return null},getInfo:function(){return{longname:"Orchard AddMedia Plugin",author:"Dave Reed",authorurl:"http://orchardproject.net",infourl:"http://orchardproject.net",version:"1.1"}}});tinymce.PluginManager.add("mediapicker",tinymce.plugins.Orchard.MediaPicker)})();
(function(){OpenAjax.hub.subscribe("orchard.admin.pickimage-picked.tinymce",function(b,d){var c=tinyMCE.get(d.editorId);c.focus();c.selection.setContent(d.img.html)});tinymce.create("tinymce.plugins.Orchard.MediaPicker",{init:function(b,d){b.addCommand("mceMediaPicker",function(){b.focus();var c,a=b.selection.getContent();if(a){a=a.replace(/\<IMG/gi,"<editimg");a=$(a).filter("editimg");if(a.length)c={src:a.attr("src"),"class":a.attr("class"),style:a.css("cssText"),alt:a.attr("alt"),width:a.attr("width"),
height:a.attr("height"),align:a.attr("align")}}OpenAjax.hub.publish("orchard.admin.pickimage-open.tinymce",{editorId:b.id,img:c,uploadMediaPath:b.getParam("mediapicker_uploadpath")})});b.addButton("mediapicker",{title:b.getParam("mediapicker_title"),cmd:"mceMediaPicker",image:d+"/img/picture_add.png"})},createControl:function(){return null},getInfo:function(){return{longname:"Orchard AddMedia Plugin",author:"Dave Reed",authorurl:"http://orchardproject.net",infourl:"http://orchardproject.net",version:"1.1"}}});
tinymce.PluginManager.add("mediapicker",tinymce.plugins.Orchard.MediaPicker)})();

1
src/Orchard.Web/Modules/TinyMce/Scripts/plugins/mediapicker/editor_plugin_src.js
View File

@@ -48,7 +48,6 @@
OpenAjax.hub.publish("orchard.admin.pickimage-open.tinymce", {
editorId: ed.id,
img: editImage,
uploadMediaAction: ed.getParam("mediapicker_uploadaction"),
uploadMediaPath: ed.getParam("mediapicker_uploadpath")
});
});

1
src/Orchard.Web/Modules/TinyMce/Views/Body-Html.Editor.cshtml
View File

@@ -15,7 +15,6 @@
theme_advanced_buttons2: "",
theme_advanced_buttons3: "",
convert_urls: false,
mediapicker_uploadaction: "@Url.Action("AddFromClient", "Admin", new {area = "Orchard.Media"})",
mediapicker_uploadpath: "@Model.AddMediaPath",
mediapicker_title: "@T("Insert/Update Media")",
extended_valid_elements: "canvas[id|width|height],script[src|type]," +