diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/App_Themes/Default/Styles/Skin.css b/WebsitePanel/Sources/WebsitePanel.WebPortal/App_Themes/Default/Styles/Skin.css index 6aa378a2..ac788077 100644 --- a/WebsitePanel/Sources/WebsitePanel.WebPortal/App_Themes/Default/Styles/Skin.css +++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/App_Themes/Default/Styles/Skin.css @@ -36,9 +36,10 @@ float: left; } -.FormButtonsBar .Right +.FormButtonsBar Button2.Right { text-align: right; + margin-bottom: 3px; } .FormButtonsBarClean @@ -1405,3 +1406,9 @@ table#toolbar } p.warningText {font-size:14px; color:Red; text-align:center;} + + +.Hidden +{ + display: none; +} \ No newline at end of file diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/App_LocalResources/WebSitesEditSite.ascx.resx b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/App_LocalResources/WebSitesEditSite.ascx.resx index 78df331e..8d6cfce8 100644 --- a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/App_LocalResources/WebSitesEditSite.ascx.resx +++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/App_LocalResources/WebSitesEditSite.ascx.resx @@ -225,24 +225,6 @@ Groups - - Click "Add .htaccess Folder" button to add .htaccess folder - - - .htaccess Folders - - - Click "Add .htaccess User" button to add .htaccess user - - - .htaccess Users - - - Click "Add .htaccess Group" button to add .htaccess group - - - .htaccess Groups - Custom MIME types are not defined diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/App_LocalResources/WebSitesHeliconApeControl.ascx.resx b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/App_LocalResources/WebSitesHeliconApeControl.ascx.resx index 7372c79d..e42d6da5 100644 --- a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/App_LocalResources/WebSitesHeliconApeControl.ascx.resx +++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/App_LocalResources/WebSitesHeliconApeControl.ascx.resx @@ -118,7 +118,7 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - Add .htaccess folder + + Add .htaccess Delete Folder @@ -132,14 +132,26 @@ Enable Helicon Ape + + Click "Add .htaccess User" button to add .htaccess user + + + .htaccess Users + + + Click "Add .htaccess Group" button to add .htaccess group + + + .htaccess Groups + Enable Helicon Ape (45 days trial) - Click "Add Folder" button to add .htaccess folder + Click "Add .htaccess" button to add .htaccess - Helicon Ape Folders + Folders containing .htaccess This feature will automatically change the following settings for the web site:\r\n\r\n- Enable Integration Pipeline;\r\n- Disable Secured Folders feature (if enabled);\r\n- Disable Integrated Windows Authentication;\r\n\r\nPlease click OK button to proceed or Cancel button if you would like to modify these settings manually. @@ -155,7 +167,7 @@ mod_rewrite, mod_proxy, mod_auth, mod_gzip, mod_headers, mod_cache, mod_expires, mod_replace and others. - Add Group + + Add Group ShowProgressDialog('Installing Helicon Ape.<br /><br /><small>It may take several minutes...</small>'); @@ -170,6 +182,18 @@ http://www.helicontech.com/ape/doc/wsp.htm - Help + About .htaccess support & Help + + + Select .htaccess to edit: + + + + Add user + + + .htpasswd users + + + .htpasswd groups \ No newline at end of file diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/WebSitesHeliconApeControl.ascx b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/WebSitesHeliconApeControl.ascx index a6b82472..69a2a531 100644 --- a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/WebSitesHeliconApeControl.ascx +++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/WebSitesHeliconApeControl.ascx @@ -2,66 +2,89 @@ Inherits="WebsitePanel.Portal.WebSitesHeliconApeControl" %> <%@ Import Namespace="WebsitePanel.Portal" %> -
- -

-

-
- -

-

-
- -
- -
-
- -
- -
+ + + + + + + + + +
+ + + +
+ ShowHeader="False" CssSelectorClass="LightGridView" EmptyDataText="gvHeliconApeFolders" + DataKeyNames="Path,ContentPath" OnRowDeleting="gvHeliconApeFolders_RowDeleting" Width="100%"> - - + + - + <%# Eval("Path")%> - + - + title="Folder Security Properties (.htpasswd)"> + Security options - +
-
- -
+ + + + + + + + + + + + +
+ + + + + +
+ +

+

+
+ +

+

+
+ +
+ +
+
+ + + \ No newline at end of file diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/WebSitesHeliconApeControl.ascx.designer.cs b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/WebSitesHeliconApeControl.ascx.designer.cs index afdd9180..6d0c3d89 100644 --- a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/WebSitesHeliconApeControl.ascx.designer.cs +++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/WebSitesHeliconApeControl.ascx.designer.cs @@ -12,33 +12,6 @@ namespace WebsitePanel.Portal { public partial class WebSitesHeliconApeControl { - /// - /// panelHeliconApeIsNotInstalledMessage control. - /// - /// - /// Auto-generated field. - /// To modify move field declaration from designer file to code-behind file. - /// - protected global::System.Web.UI.WebControls.Panel panelHeliconApeIsNotInstalledMessage; - - /// - /// panelHeliconApeIsNotEnabledMessage control. - /// - /// - /// Auto-generated field. - /// To modify move field declaration from designer file to code-behind file. - /// - protected global::System.Web.UI.WebControls.Panel panelHeliconApeIsNotEnabledMessage; - - /// - /// btnToggleHeliconApe control. - /// - /// - /// Auto-generated field. - /// To modify move field declaration from designer file to code-behind file. - /// - protected global::System.Web.UI.WebControls.Button btnToggleHeliconApe; - /// /// HeliconApeFoldersPanel control. /// @@ -84,6 +57,15 @@ namespace WebsitePanel.Portal { /// protected global::System.Web.UI.WebControls.GridView gvHeliconApeUsers; + /// + /// Label1 control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.Label Label1; + /// /// btnAddHeliconApeGroup control. /// @@ -101,5 +83,59 @@ namespace WebsitePanel.Portal { /// To modify move field declaration from designer file to code-behind file. /// protected global::System.Web.UI.WebControls.GridView gvHeliconApeGroups; + + /// + /// panelHeliconApeIsNotInstalledMessage control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.Panel panelHeliconApeIsNotInstalledMessage; + + /// + /// Localize1 control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.Localize Localize1; + + /// + /// panelHeliconApeIsNotEnabledMessage control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.Panel panelHeliconApeIsNotEnabledMessage; + + /// + /// Localize2 control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.Localize Localize2; + + /// + /// btnToggleHeliconApe control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.Button btnToggleHeliconApe; + + /// + /// HyperLink1 control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.HyperLink HyperLink1; } }