Permalink
Browse files

reformat code

  • Loading branch information...
ninianne98 committed Nov 2, 2018
1 parent 6bb7347 commit e80dc8a155167e944d5f78f9fd1a6cb2898570c3
Showing with 1,171 additions and 1,311 deletions.
  1. +3 −3 CMSAdmin/AdminBaseMasterPage.cs
  2. +4 −4 CMSAdmin/AdminBasePage.cs
  3. +2 −2 CMSAdmin/AdminBaseUserControl.cs
  4. +40 −55 CMSAdmin/c3-admin/BlogPostAddEdit.aspx
  5. +3 −3 CMSAdmin/c3-admin/BlogPostAddEdit.aspx.cs
  6. +12 −23 CMSAdmin/c3-admin/BlogPostEdit.aspx
  7. +3 −3 CMSAdmin/c3-admin/BlogPostEdit.aspx.cs
  8. +5 −9 CMSAdmin/c3-admin/BlogPostIndex.aspx
  9. +3 −3 CMSAdmin/c3-admin/BlogPostIndex.aspx.cs
  10. +5 −10 CMSAdmin/c3-admin/BlogPostTemplateUpdate.aspx
  11. +3 −3 CMSAdmin/c3-admin/BlogPostTemplateUpdate.aspx.cs
  12. +3 −6 CMSAdmin/c3-admin/CategoryAddEdit.aspx
  13. +2 −2 CMSAdmin/c3-admin/CategoryAddEdit.aspx.cs
  14. +2 −2 CMSAdmin/c3-admin/CategoryIndex.aspx.cs
  15. +2 −3 CMSAdmin/c3-admin/CommentAddEdit.aspx.cs
  16. +2 −3 CMSAdmin/c3-admin/CommentAddEditPop.aspx.cs
  17. +2 −2 CMSAdmin/c3-admin/CommentIndex.aspx.cs
  18. +2 −2 CMSAdmin/c3-admin/CommentIndexPop.aspx.cs
  19. +2 −1 CMSAdmin/c3-admin/ContentEdit.aspx
  20. +2 −2 CMSAdmin/c3-admin/ContentEdit.aspx.cs
  21. +1 −1 CMSAdmin/c3-admin/ContentEditHistory.aspx
  22. +3 −3 CMSAdmin/c3-admin/ContentEditHistory.aspx.cs
  23. +20 −24 CMSAdmin/c3-admin/ContentSnippetAddEdit.aspx
  24. +3 −3 CMSAdmin/c3-admin/ContentSnippetAddEdit.aspx.cs
  25. +3 −3 CMSAdmin/c3-admin/ContentSnippetHistory.aspx.cs
  26. +1 −2 CMSAdmin/c3-admin/ContentSnippetIndex.aspx
  27. +2 −2 CMSAdmin/c3-admin/ContentSnippetIndex.aspx.cs
  28. +5 −5 CMSAdmin/c3-admin/ControlPropertiesEdit.aspx.cs
  29. +3 −6 CMSAdmin/c3-admin/CreateFirstAdmin.aspx
  30. +4 −4 CMSAdmin/c3-admin/CreateFirstAdmin.aspx.cs
  31. +7 −6 CMSAdmin/c3-admin/DatabaseSetup.aspx
  32. +5 −5 CMSAdmin/c3-admin/DatabaseSetup.aspx.cs
  33. +2 −2 CMSAdmin/c3-admin/Default.aspx.cs
  34. +3 −3 CMSAdmin/c3-admin/DuplicateWidgetFrom.aspx.cs
  35. +157 −164 CMSAdmin/c3-admin/FileBrowser.aspx
  36. +4 −4 CMSAdmin/c3-admin/FileBrowser.aspx.cs
  37. +3 −3 CMSAdmin/c3-admin/FileUp.ashx.cs
  38. +4 −8 CMSAdmin/c3-admin/ForgotPassword.aspx
  39. +2 −2 CMSAdmin/c3-admin/ForgotPassword.aspx.cs
  40. +8 −29 CMSAdmin/c3-admin/Helper.cs
  41. +5 −10 CMSAdmin/c3-admin/Logon.aspx
  42. +3 −3 CMSAdmin/c3-admin/Logon.aspx.cs
  43. +133 −131 CMSAdmin/c3-admin/MasterPages/Main.Master
  44. +2 −2 CMSAdmin/c3-admin/MasterPages/Main.Master.cs
  45. +43 −41 CMSAdmin/c3-admin/MasterPages/MainPopup.Master
  46. +2 −2 CMSAdmin/c3-admin/MasterPages/MainPopup.Master.cs
  47. +45 −45 CMSAdmin/c3-admin/MasterPages/Public.Master
  48. +2 −2 CMSAdmin/c3-admin/MasterPages/Public.Master.cs
  49. +2 −2 CMSAdmin/c3-admin/ModuleIndex.aspx.cs
  50. +2 −3 CMSAdmin/c3-admin/ModulePopup.aspx.cs
  51. +18 −21 CMSAdmin/c3-admin/PageAddChild.aspx
  52. +8 −2 CMSAdmin/c3-admin/PageAddChild.aspx.cs
  53. +33 −51 CMSAdmin/c3-admin/PageAddEdit.aspx
  54. +3 −3 CMSAdmin/c3-admin/PageAddEdit.aspx.cs
  55. +13 −9 CMSAdmin/c3-admin/PageChildSort.aspx
  56. +3 −3 CMSAdmin/c3-admin/PageChildSort.aspx.cs
  57. +12 −24 CMSAdmin/c3-admin/PageEdit.aspx
  58. +2 −2 CMSAdmin/c3-admin/PageEdit.aspx.cs
  59. +2 −2 CMSAdmin/c3-admin/PageExport.aspx.cs
  60. +3 −3 CMSAdmin/c3-admin/PageHistory.aspx.cs
  61. +2 −2 CMSAdmin/c3-admin/PageImport.aspx.cs
  62. +4 −7 CMSAdmin/c3-admin/PageIndex.aspx
  63. +3 −3 CMSAdmin/c3-admin/PageIndex.aspx.cs
  64. +4 −8 CMSAdmin/c3-admin/PageTemplateUpdate.aspx
  65. +3 −3 CMSAdmin/c3-admin/PageTemplateUpdate.aspx.cs
  66. +2 −2 CMSAdmin/c3-admin/PageWidgets.aspx.cs
  67. +257 −229 CMSAdmin/c3-admin/PlainTemplate.aspx
  68. +9 −18 CMSAdmin/c3-admin/SiteContentStatusChange.aspx
  69. +3 −3 CMSAdmin/c3-admin/SiteContentStatusChange.aspx.cs
  70. +5 −10 CMSAdmin/c3-admin/SiteDetail.aspx
  71. +3 −4 CMSAdmin/c3-admin/SiteDetail.aspx.cs
  72. +2 −2 CMSAdmin/c3-admin/SiteExport.aspx.cs
  73. +7 −14 CMSAdmin/c3-admin/SiteImport.aspx
  74. +3 −3 CMSAdmin/c3-admin/SiteImport.aspx.cs
  75. +2 −2 CMSAdmin/c3-admin/SiteIndex.aspx.cs
  76. +18 −36 CMSAdmin/c3-admin/SiteInfo.aspx
  77. +3 −3 CMSAdmin/c3-admin/SiteInfo.aspx.cs
  78. +2 −3 CMSAdmin/c3-admin/SiteMapPop.aspx.cs
  79. +2 −1 CMSAdmin/c3-admin/SiteSkinEdit.aspx
  80. +4 −4 CMSAdmin/c3-admin/SiteSkinEdit.aspx.cs
  81. +3 −3 CMSAdmin/c3-admin/SiteSkinIndex.aspx.cs
  82. +3 −4 CMSAdmin/c3-admin/SiteTemplateUpdate.aspx.cs
  83. +3 −6 CMSAdmin/c3-admin/TagAddEdit.aspx
  84. +2 −2 CMSAdmin/c3-admin/TagAddEdit.aspx.cs
  85. +2 −2 CMSAdmin/c3-admin/TagIndex.aspx.cs
  86. +3 −3 CMSAdmin/c3-admin/TextWidgetIndex.aspx.cs
  87. +4 −4 CMSAdmin/c3-admin/User.aspx
  88. +3 −3 CMSAdmin/c3-admin/User.aspx.cs
  89. +2 −4 CMSAdmin/c3-admin/UserAdd.aspx
  90. +3 −3 CMSAdmin/c3-admin/UserAdd.aspx.cs
  91. +1 −2 CMSAdmin/c3-admin/UserGroupAddEdit.aspx
  92. +3 −3 CMSAdmin/c3-admin/UserGroupAddEdit.aspx.cs
  93. +2 −2 CMSAdmin/c3-admin/UserGroups.aspx.cs
  94. +2 −2 CMSAdmin/c3-admin/UserMembership.aspx.cs
  95. +2 −1 CMSAdmin/c3-admin/UserPassword.aspx
  96. +4 −2 CMSAdmin/c3-admin/UserProfile.aspx
  97. +2 −2 CMSAdmin/c3-admin/UserProfile.aspx.cs
  98. +3 −3 CMSAdmin/c3-admin/WidgetHistory.aspx.cs
  99. +3 −4 CMSAdmin/c3-admin/WidgetList.aspx.cs
  100. +3 −6 CMSAdmin/c3-admin/WidgetTime.aspx
  101. +2 −2 CMSAdmin/c3-admin/WidgetTime.aspx.cs
  102. +4 −4 CMSAdmin/c3-admin/ucAdminModule.ascx.cs
  103. +15 −9 CMSAdmin/c3-admin/ucAdvancedEdit.ascx
  104. +4 −4 CMSAdmin/c3-admin/ucAdvancedEdit.ascx.cs
  105. +2 −4 CMSAdmin/c3-admin/ucBlogMenuItems.ascx
  106. +9 −18 CMSAdmin/c3-admin/ucCommentAddEdit.ascx
  107. +2 −2 CMSAdmin/c3-admin/ucCommentAddEdit.ascx.cs
  108. +4 −7 CMSAdmin/c3-admin/ucCommentIndex.ascx
  109. +3 −3 CMSAdmin/c3-admin/ucCommentIndex.ascx.cs
  110. +2 −2 CMSAdmin/c3-admin/ucEditDateTime.ascx.cs
  111. +12 −8 CMSAdmin/c3-admin/ucEditNotifier.ascx
  112. +3 −3 CMSAdmin/c3-admin/ucEditNotifier.ascx.cs
  113. +2 −4 CMSAdmin/c3-admin/ucPageMenuItems.ascx
  114. +2 −0 CMSAdmin/c3-admin/ucPageMenuItems.ascx.cs
  115. +10 −4 CMSAdmin/c3-admin/ucSiteMap.ascx
  116. +3 −3 CMSAdmin/c3-admin/ucSiteMap.ascx.cs
  117. +1 −2 CMSAdmin/c3-admin/ucSitePageDrillDown.ascx
  118. +0 −1 CMSAdmin/c3-admin/ucSitePageDrillDown.ascx.cs
  119. +14 −28 CMSAdmin/c3-admin/wp-SiteImport.aspx
  120. +4 −4 CMSAdmin/c3-admin/wp-SiteImport.aspx.cs
  121. +4 −0 PluginPhotoGallery/PluginPhotoGallery.csproj
@@ -1,9 +1,9 @@
using System;
using Carrotware.CMS.Core;
using Carrotware.CMS.UI.Base;
using System;
using System.IO;
using System.Web.UI;
using System.Web.UI.WebControls;
using Carrotware.CMS.Core;
using Carrotware.CMS.UI.Base;
/*
* CarrotCake CMS
@@ -1,12 +1,12 @@
using System;
using Carrotware.CMS.Core;
using Carrotware.CMS.UI.Base;
using Carrotware.CMS.UI.Controls;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Web.Security;
using System.Web.UI;
using System.Web.UI.WebControls;
using Carrotware.CMS.Core;
using Carrotware.CMS.UI.Base;
using Carrotware.CMS.UI.Controls;
/*
* CarrotCake CMS
@@ -1,7 +1,7 @@
using System;
using Carrotware.CMS.Core;
using Carrotware.CMS.Core;
using Carrotware.CMS.UI.Base;
using Carrotware.CMS.UI.Controls;
using System;
/*
* CarrotCake CMS
@@ -350,47 +350,43 @@
<div class="ui-state-highlight ui-corner-all" style="padding: 5px; margin-top: 5px; margin-bottom: 5px; width: 500px;">
<p>
<span class="ui-icon ui-icon-info" style="float: left; margin: 3px;"></span>
<asp:Literal ID="litUser" runat="server">&nbsp;</asp:Literal></p>
<asp:Literal ID="litUser" runat="server">&nbsp;</asp:Literal>
</p>
</div>
</div>
<div id="PageContents">
<table style="width: 700px;">
<tr>
<td style="width: 125px;" class="tablecaption">
last updated:
<td style="width: 125px;" class="tablecaption">last updated:
</td>
<td style="width: 575px;">
<asp:Label ID="lblUpdated" runat="server" />
</td>
</tr>
<tr>
<td class="tablecaption">
create date:
<td class="tablecaption">create date:
</td>
<td>
<asp:Label ID="lblCreateDate" runat="server" /><br />
<br />
</td>
</tr>
<tr>
<td class="tablecaption">
release date:
<td class="tablecaption">release date:
</td>
<td>
<uc1:datetime runat="server" ID="ucReleaseDate" ValidationGroup="inputForm" OnBlur="CheckFileName()" OnChange="CheckFileName();" />
</td>
</tr>
<tr>
<td class="tablecaption">
retire date:
<td class="tablecaption">retire date:
</td>
<td>
<uc1:datetime runat="server" ID="ucRetireDate" ValidationGroup="inputForm" />
</td>
</tr>
<tr>
<td class="tablecaption">
titlebar:
<td class="tablecaption">titlebar:
</td>
<td>
<asp:TextBox ValidationGroup="inputForm" onkeypress="return ProcessKeyPress(event)" onblur="AutoGeneratePageFilename()" ID="txtTitle" runat="server"
@@ -412,8 +408,7 @@
</td>
</tr>
<tr>
<td class="tablecaption">
filename:
<td class="tablecaption">filename:
</td>
<td>
<asp:TextBox ValidationGroup="inputForm" onkeypress="return ProcessKeyPress(event)" onblur="CheckFileName()" ID="txtPageSlug" runat="server"
@@ -433,8 +428,7 @@
</td>
</tr>
<tr>
<td class="tablecaption">
navigation:
<td class="tablecaption">navigation:
</td>
<td>
<asp:TextBox ValidationGroup="inputForm" onkeypress="return ProcessKeyPress(event)" ID="txtNav" runat="server" Columns="60" MaxLength="200" />
@@ -443,26 +437,23 @@
</td>
</tr>
<tr>
<td class="tablecaption">
page head:
<td class="tablecaption">page head:
</td>
<td>
<asp:TextBox ValidationGroup="inputForm" onkeypress="return ProcessKeyPress(event)" ID="txtHead" runat="server" Columns="60" MaxLength="200" />
</td>
</tr>
<tr>
<td class="tablecaption">
thumbnail:
<td class="tablecaption">thumbnail:
<br />
</td>
<td>
<asp:TextBox ValidationGroup="inputForm" onkeypress="return ProcessKeyPress(event)" ID="txtThumb" runat="server" Columns="60" MaxLength="200" />
<input type="button" id="Button1" value="Browse" onclick="cmsFileBrowserOpenReturn('<%=txtThumb.ClientID %>');return false;" />
<input type="button" id="Button1" value="Browse" onclick="cmsFileBrowserOpenReturn('<%=txtThumb.ClientID %> ');return false;" />
</td>
</tr>
<tr>
<td class="tablecaption">
&nbsp;
<td class="tablecaption">&nbsp;
</td>
<td>
<asp:CheckBox ID="chkActive" runat="server" Text="Show publicly" />
@@ -471,8 +462,7 @@
</td>
</tr>
<tr>
<td class="tablecaption">
credit author:
<td class="tablecaption">credit author:
</td>
<td>
<b>find:</b> <span id="spanResults"></span>
@@ -482,16 +472,14 @@
</td>
</tr>
<tr>
<td style="width: 125px;" class="tablecaption">
meta keywords:
<td style="width: 125px;" class="tablecaption">meta keywords:
</td>
<td>
<asp:TextBox ValidationGroup="inputForm" ID="txtKey" MaxLength="1000" Columns="60" Style="width: 475px;" Rows="4" TextMode="MultiLine" runat="server" />
</td>
</tr>
<tr>
<td class="tablecaption">
meta description:
<td class="tablecaption">meta description:
</td>
<td>
<asp:TextBox ValidationGroup="inputForm" ID="txtDescription" MaxLength="1000" Columns="60" Style="width: 475px;" Rows="4" TextMode="MultiLine"
@@ -537,8 +525,7 @@
</table>
<table style="width: 700px;">
<tr>
<td class="tablecaption">
template:
<td class="tablecaption">template:
</td>
<td>
<asp:DropDownList DataTextField="Caption" DataValueField="TemplatePath" ID="ddlTemplate" runat="server" />
@@ -547,8 +534,7 @@
</td>
</tr>
<tr>
<td class="tablecaption">
</td>
<td class="tablecaption"></td>
<td align="right">
<input type="button" id="btnBrowseSvr" value="Browse Server Files" onclick="cmsFileBrowserOpen('not-a-real-file');" />
</td>
@@ -568,7 +554,8 @@
<div style="margin-bottom: 25px;">
<div runat="server" id="divLeft">
body (left)<br />
<a href="javascript:cmsToggleTinyMCE('<%= reLeftBody.ClientID %>');">Show/Hide Editor</a></div>
<a href="javascript:cmsToggleTinyMCE('<%= reLeftBody.ClientID %>');">Show/Hide Editor</a>
</div>
<asp:TextBox Style="height: 300px; width: 850px;" CssClass="mceEditor" ID="reLeftBody" runat="server" TextMode="MultiLine" Rows="15" Columns="80" />
<br />
</div>
@@ -577,7 +564,8 @@
<div style="margin-bottom: 25px;">
<div runat="server" id="divCenter">
body (main/center)<br />
<a href="javascript:cmsToggleTinyMCE('<%= reBody.ClientID %>');">Show/Hide Editor</a></div>
<a href="javascript:cmsToggleTinyMCE('<%= reBody.ClientID %>');">Show/Hide Editor</a>
</div>
<asp:TextBox Style="height: 300px; width: 850px;" CssClass="mceEditor" ID="reBody" runat="server" TextMode="MultiLine" Rows="15" Columns="80" />
<br />
</div>
@@ -586,7 +574,8 @@
<div style="margin-bottom: 25px;">
<div runat="server" id="divRight">
body (right)<br />
<a href="javascript:cmsToggleTinyMCE('<%= reRightBody.ClientID %>');">Show/Hide Editor</a></div>
<a href="javascript:cmsToggleTinyMCE('<%= reRightBody.ClientID %>');">Show/Hide Editor</a>
</div>
<asp:TextBox Style="height: 300px; width: 850px;" CssClass="mceEditor" ID="reRightBody" runat="server" TextMode="MultiLine" Rows="15" Columns="80" />
<br />
</div>
@@ -596,8 +585,7 @@
<div class="scroll-area" style="height: 310px; width: 775px;">
<div class="SortableGrid">
<div>
<h3>
HTML Rich Text Widgets</h3>
<h3>HTML Rich Text Widgets</h3>
<carrot:CarrotGridView CssClass="datatable" DefaultSort="WidgetOrder ASC" ID="gvHtmControls" runat="server" AutoGenerateColumns="false" HeaderStyle-CssClass="tablehead"
AlternatingRowStyle-CssClass="rowalt" RowStyle-CssClass="rowregular">
<EmptyDataTemplate>
@@ -635,8 +623,7 @@
</div>
<br />
<div>
<h3>
Plain Text Widgets</h3>
<h3>Plain Text Widgets</h3>
<carrot:CarrotGridView CssClass="datatable" DefaultSort="WidgetOrder ASC" ID="gvTxtControls" runat="server" AutoGenerateColumns="false" HeaderStyle-CssClass="tablehead"
AlternatingRowStyle-CssClass="rowalt" RowStyle-CssClass="rowregular">
<EmptyDataTemplate>
@@ -698,10 +685,10 @@
<tr>
<td align="left">
<div id="cmsHeartBeat" style="clear: both; padding: 2px; margin: 2px; min-height: 22px;">
&nbsp;</div>
&nbsp;
</div>
</td>
<td>
&nbsp;&nbsp;
<td>&nbsp;&nbsp;
</td>
</tr>
</table>
@@ -723,15 +710,13 @@
<td>
<asp:CheckBox ID="chkDraft" runat="server" Text=" Save this as draft" />
</td>
<td>
&nbsp;&nbsp;
<td>&nbsp;&nbsp;
</td>
<asp:PlaceHolder runat="server" ID="pnlReview">
<td align="right">
<asp:DropDownList ID="ddlVersions" runat="server" DataValueField="Key" DataTextField="Value" />
</td>
<td>
&nbsp;&nbsp;
<td>&nbsp;&nbsp;
</td>
<td align="left">
<input type="button" onclick="javascript:cmsPageVersionNav();" name="btnReview" value="Review / Revert" />
@@ -789,19 +774,19 @@
function ClickSaveBtn() {
if (cmsIsPageValid()) {
$('#<%=btnSave.ClientID %>').click();
}
}
}
function ClickSaveVisitBtn() {
if (cmsIsPageValid()) {
$('#<%=btnSaveVisit.ClientID %>').click();
}
function ClickSaveVisitBtn() {
if (cmsIsPageValid()) {
$('#<%=btnSaveVisit.ClientID %>').click();
}
}
function SaveCommon() {
cmsSaveMakeOKAndCancelLeave();
var ret = cmsPreSaveTrigger();
cmsLoadPrettyValidationPopup('<%= formValidationSummary.ClientID %>');
function SaveCommon() {
cmsSaveMakeOKAndCancelLeave();
var ret = cmsPreSaveTrigger();
cmsLoadPrettyValidationPopup('<%= formValidationSummary.ClientID %>');
return true;
}
</script>
@@ -1,9 +1,9 @@
using System;
using Carrotware.CMS.Core;
using Carrotware.CMS.UI.Controls;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Web.Security;
using Carrotware.CMS.Core;
using Carrotware.CMS.UI.Controls;
/*
* CarrotCake CMS
Oops, something went wrong.

0 comments on commit e80dc8a

Please sign in to comment.