Skip to content

Commit

Permalink
file browser refactoring
Browse files Browse the repository at this point in the history
  • Loading branch information
@ninianne98
ninianne98 committed Jul 18, 2023
1 parent 848b2a1 commit 34787bc
Show file tree
Hide file tree
Showing 7 changed files with 328 additions and 265 deletions.
16 changes: 9 additions & 7 deletions CMSAdmin/c3-admin/FileBrowser.aspx
View file
Expand Up @@ -136,7 +136,6 @@
var fld = $(selFile);
var uri = fld.val();

var imgReal = $(imgRealId);
$(imgReal).attr('src', '');
var h = -1;
var w = -1;
Expand Down Expand Up @@ -231,11 +230,11 @@
<div class="ui-widget-header ui-corner-all thumbCell" runat="server" id="imgContainerGroup">
<div runat="server" id="imgContainer" onmouseout="hideImg(this)" onmouseover="showImg(this, 'thumb')">
<div id="imgWrapper" style="display: none;">
<img id="imgThmbnail" filetype="<%# FileImageLink(Eval("MimeType").ToString()) %>" alt="" src="<%# CreateFileSrc(Eval("FolderPath").ToString(), Eval("FileName").ToString(), Eval("MimeType").ToString()) %>" />
<img id="imgThmbnail" filetype="<%# FileImageLink(Eval("MimeType").ToString()) %>" alt="" src="<%# CreateFileSrc(Eval("FullFileName").ToString(), Eval("MimeType").ToString()) %>" />
</div>
<div style="margin: 3px;" id="imgSubContainer">
<a runat="server" id="lnkContent" href='<%# CreateFileLink(String.Format( "{0}{1}", Eval("FolderPath"), Eval("FileName") )) %>'>
<carrot:ImageSizer runat="server" ID="ImageSizer1" ImageUrl='<%# String.Format( "{0}{1}", Eval("FolderPath"), Eval("FileName") ) %>' ThumbSize="50"
<a runat="server" id="lnkContent" href='<%# CreateFileLink(String.Format("{0}", Eval("FullFileName"))) %>'>
<carrot:ImageSizer runat="server" ID="ImageSizer1" ImageUrl='<%# String.Format("{0}", Eval("FullFileName")) %>' ThumbSize="50"
ScaleImage="true" ToolTip="" />
</a>
</div>
Expand Down Expand Up @@ -273,11 +272,11 @@
<td>
<div class="ImgGroup" runat="server" id="imgContainerGroup">
<div runat="server" id="imgContainer" onmouseout="hideImg(this)" onmouseover="showImg(this, 'file')">
<a runat="server" id="lnkContent" href='<%# CreateFileLink(String.Format( "{0}{1}", Eval("FolderPath"), Eval("FileName") )) %>'>
<a runat="server" id="lnkContent" href='<%# CreateFileLink(String.Format("{0}", Eval("FullFileName"))) %>'>
<%# String.Format( "{0}", Eval("FileName") ) %></a>
</div>
<div id="imgWrapper" style="display: none;">
<img id="imgThmbnail" filetype="<%# FileImageLink(Eval("MimeType").ToString()) %>" alt="" src="<%# CreateFileSrc(Eval("FolderPath").ToString(), Eval("FileName").ToString(), Eval("MimeType").ToString()) %>" />
<img id="imgThmbnail" filetype="<%# FileImageLink(Eval("MimeType").ToString()) %>" alt="" src="<%# CreateFileSrc(Eval("FullFileName").ToString(), Eval("MimeType").ToString()) %>" />
</div>
</div>
</td>
Expand Down Expand Up @@ -322,6 +321,8 @@
$(divImgLayer).attr('style', 'display:none;');
$(divImgLayer).attr('class', '');

imgReal = $(imgRealId);

$(imgThumb).attr('src', defaultImage);
$(imgThumb).attr('width', 64);
$(imgThumb).attr('height', 64);
Expand Down Expand Up @@ -354,6 +355,8 @@

$(divImgLayer).attr('class', 'thumbpreview ui-corner-all');

imgReal = $(imgRealId);

$(imgThumb).attr('alt', val);
$(imgThumb).attr('title', val);
$(imgThumb).attr('src', val);
Expand All @@ -369,7 +372,6 @@
}

function resizeImg() {

$(imgDim).html($(imgReal).width() + ' x ' + $(imgReal).height());

if ($(imgThumb).height() > 175) {
Expand Down
11 changes: 6 additions & 5 deletions CMSAdmin/c3-admin/FileBrowser.aspx.cs
View file
Expand Up @@ -4,6 +4,7 @@
using System;
using System.IO;
using System.Linq;
using System.Web;
using System.Web.UI.WebControls;

/*
Expand Down Expand Up @@ -77,7 +78,7 @@ public partial class FileBrowser : AdminBasePage {
lnkUp.Visible = true;
}
sQueryPath = sQueryPath.StartsWith(@"/") ? sQueryPath : @"/" + sQueryPath;
sQueryPath.Replace("//", "/").Replace("//", "/");
sQueryPath.FixFolderSlashes();

if (lnkUp.Visible) {
string sUrlUp = sQueryPath.Substring(0, sQueryPath.Substring(0, sQueryPath.Length - 2).LastIndexOf('/')) + @"/";
Expand Down Expand Up @@ -118,13 +119,13 @@ public partial class FileBrowser : AdminBasePage {
}
}

public string CreateFileLink(string sPath) {
return string.Format("javascript:SetFile('{0}');", sPath);
public string CreateFileLink(string sFullPath) {
return string.Format("javascript:SetFile('{0}');", HttpUtility.UrlEncode(sFullPath));
}

public string CreateFileSrc(string sPath, string sFile, string sMime) {
public string CreateFileSrc(string sFullPath, string sMime) {
if (FileImageLink(sMime).ToLowerInvariant() == "image") {
return string.Format("{0}{1}", sPath, sFile).ToLowerInvariant();
return string.Format("{0}", sFullPath).ToLowerInvariant();
} else {
return SiteData.AdminFolderPath + "images/document.png";
}
Expand Down
4 changes: 2 additions & 2 deletions CMSInterfaces/ParmParser.cs
View file
Expand Up @@ -17,7 +17,7 @@ namespace Carrotware.CMS.Interface {

public static class ParmParser {

public static string GetParmValue(Dictionary<string, string> parmDictionary, string sKey) {
public static string GetParmValue(this Dictionary<string, string> parmDictionary, string sKey) {
string ret = null;

if (parmDictionary.Any()) {
Expand All @@ -29,7 +29,7 @@ where c.Key.ToLowerInvariant() == sKey.ToLowerInvariant()
return ret;
}

public static string GetParmValue(Dictionary<string, string> parmDictionary, string sKey, string sDefault) {
public static string GetParmValue(this Dictionary<string, string> parmDictionary, string sKey, string sDefault) {
string ret = null;

if (parmDictionary.Any()) {
Expand Down
68 changes: 59 additions & 9 deletions PluginCalendarModule/Site1.Master
View file
Expand Up @@ -26,12 +26,15 @@
.validationExclaim {
color: #CC9900;
}

.validationError {
color: #CC0000;
}

.validationDelete {
color: #660066;
}

.validationCross {
color: #000066;
}
Expand All @@ -40,14 +43,17 @@
border: thin solid #CC9900 !important;
background-color: #FFFAE6 !important;
}

.validationErrorBox {
border: thin solid #CC0000 !important;
background-color: #FFF2F2 !important;
}

.validationDeleteBox {
border: thin solid #660066 !important;
background-color: #FFD2FF !important;
}

.validationCrossBox {
border: thin solid #000066 !important;
background-color: #CCCCFF !important;
Expand Down Expand Up @@ -88,19 +94,63 @@
});
});
</script>

<script type="text/javascript" src="https://cdnjs.cloudflare.com/ajax/libs/tinymce/5.10.7/tinymce.min.js" integrity="sha512-Ckge7OuE2kEtJHLhA8wnsn3aEImoJpk3k4MAhbGnGVlxYAgx/5uv/MYdPTzuX6/dCwbPriGxylCRhTKcRd0MZQ==" crossorigin="anonymous" referrerpolicy="no-referrer"></script>

<script type="text/javascript">
function cmsTinyMceInit(w, h, r) {
tinymce.init({
selector: "textarea.mceEditor",
height: h,
width: w,
resize: r,
menubar: false,
plugins: 'image imagetools link lists media charmap searchreplace visualblocks paste print table preview code codesample help',
toolbar: [
'undo redo | formatselect forecolor backcolor | bold italic backcolor | bullist numlist outdent indent | help',
'bold italic underline strikethrough sub sup | alignleft aligncenter alignright alignjustify | removeformat pastetext charmap | codesample code preview visualblocks'
],
content_style: 'body { font-family:Helvetica,Arial,sans-serif; font-size:14px }'
});
}

function cmsPreSaveTrigger() {
var tgr = tinymce.triggerSave();

return true;
}
</script>
<script type="text/javascript">
function AjaxTinyLoad() {
cmsTinyMceInit(720, 500, false);
}

function UpdateAjaxTiny() {
if (typeof (Sys) != 'undefined') {
var prm = Sys.WebForms.PageRequestManager.getInstance();
prm.add_endRequest(function () {
AjaxTinyLoad();
});
}
}

$(document).ready(function () {
UpdateAjaxTiny();
AjaxTinyLoad();
});
</script>
<asp:ContentPlaceHolder ID="head" runat="server">
</asp:ContentPlaceHolder>
</head>
<body>
<form id="form1" runat="server">
<div>
<a href="CalendarAdmin.aspx">CalendarAdmin</a> | <a href="CalendarAdminAddEdit.aspx">CalendarAdminAddEdit</a> | <a href="CalendarDisplay.aspx">
CalendarDisplay</a>
</div>
<div>
<asp:ContentPlaceHolder ID="ContentPlaceHolder1" runat="server">
</asp:ContentPlaceHolder>
</div>
<div>
<a href="CalendarAdmin.aspx">CalendarAdmin</a> | <a href="CalendarAdminAddEdit.aspx">CalendarAdminAddEdit</a> | <a href="CalendarDisplay.aspx">CalendarDisplay</a>
</div>
<div>
<asp:ContentPlaceHolder ID="ContentPlaceHolder1" runat="server">
</asp:ContentPlaceHolder>
</div>
</form>
</body>
</html>
</html>
2 changes: 1 addition & 1 deletion README.md
View file
Expand Up @@ -67,7 +67,7 @@ CarrotCakeCMS is maintained by Samantha Copeland

There may be some warnings, you can ignore them

1. The SQL Server database should be running and an empty database matching the one specified in the connection string. If you are running the code a second or later time, it will auto update if there are schema changes (see dbo note above). Do not share a database between the MVC and WebForms editions.
1. SQL Server should be running with an empty database matching the one specified in the connection string. If you are running the code a second or later time, it will auto update if there are schema changes (see dbo note above). Do not share a database between the Core, MVC 5, and WebForms editions.

1. if the database is empty or has pending database changes, you will be greeted with a maintenance screen, follow the link provided.

Expand Down

0 comments on commit 34787bc

Please sign in to comment.