Skip to content

Update to MVC5 and elFinder 2.1.18. Also added multiple themes (see: … #6

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
gordon-matt wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Update to MVC5 and elFinder 2.1.18. Also added multiple themes (see: … #6

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
6 changes: 0 additions & 6 deletions .nuget/NuGet.Config
View file
Open in desktop

This file was deleted.

Binary file removed .nuget/NuGet.exe
View file
Open in desktop
Binary file not shown.
133 changes: 0 additions & 133 deletions .nuget/NuGet.targets
View file
Open in desktop

This file was deleted.

29 changes: 0 additions & 29 deletions elFinder.Net.Web/App_Start/AttributeRoutingConfig.cs
View file
Open in desktop

This file was deleted.

31 changes: 18 additions & 13 deletions elFinder.Net.Web/App_Start/BundleConfig.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,29 +8,34 @@ public class BundleConfig
public static void RegisterBundles(BundleCollection bundles)
{
bundles.Add(new ScriptBundle("~/Scripts/js").Include(
"~/Scripts/jquery-{version}.js",
"~/Scripts/jquery-{version}.js",
//"~/Scripts/jquery-migrate-{version}.js",
"~/Scripts/jquery-ui-{version}.js",
"~/Scripts/jquery.validate*"));
"~/Scripts/jquery-ui-{version}.js",
"~/Scripts/jquery.validate*"));

#region elFinder bundles

bundles.Add(new ScriptBundle("~/Scripts/elfinder").Include(
"~/Content/elfinder/js/elfinder.full.js"
//"~/Content/elfinder/js/i18n/elfinder.pt_BR.js"
));
"~/Scripts/elfinder/elfinder.full.js"
//"~/Scripts/elfinder/i18n/elfinder.pt_BR.js"
));

// Themes:
// Default: "~/Content/elfinder/css/theme.css"
// Windows 10: "~/Content/elfinder/themes/windows-10/css/theme.css"
// Bootstrap: "~/Content/elfinder/themes/bootstrap-LibreICONS/css/theme-bootstrap-libreicons-svg.css"
// Material: "~/Content/elfinder/themes/material/theme.css"
bundles.Add(new StyleBundle("~/Content/elfinder").Include(
"~/Content/elfinder/css/elfinder.full.css",
"~/Content/elfinder/css/theme.css"));
"~/Content/elfinder/css/elfinder.full.css",
"~/Content/elfinder/themes/windows-10/css/theme.css"));

#endregion
#endregion elFinder bundles

bundles.Add(new StyleBundle("~/Content/css").Include(
"~/Content/site.css"));
bundles.Add(new StyleBundle("~/Content/css")
.Include("~/Content/site.css"));

bundles.Add(new StyleBundle("~/Content/themes/ui-lightness/css").Include(
"~/Content/themes/ui-lightness/jquery.ui.all.css"));
bundles.Add(new StyleBundle("~/Content/jquery-ui")
.Include("~/Content/themes/base/all.css"));
}
}
}
17 changes: 10 additions & 7 deletions elFinder.Net.Web/App_Start/RouteConfig.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,14 +9,17 @@ public static void RegisterRoutes(RouteCollection routes)
{
routes.IgnoreRoute("{resource}.axd/{*pathInfo}");

// elFinder's connector route
routes.MapRoute(null, "connector", new { controller = MVC.File.Name, action = MVC.File.ActionNames.Index });
routes.MapMvcAttributeRoutes();
routes.LowercaseUrls = true;

routes.MapRoute(
name: "Default",
url: "{controller}/{action}/{id}",
defaults: new { controller = MVC.Home.Name, action = MVC.Home.ActionNames.Index, id = UrlParameter.Optional }
);
//// elFinder's connector route
//routes.MapRoute(null, "connector", new { controller = MVC.File.Name, action = MVC.File.ActionNames.Index });

//routes.MapRoute(
// name: "Default",
// url: "{controller}/{action}/{id}",
// defaults: new { controller = MVC.Home.Name, action = MVC.Home.ActionNames.Index, id = UrlParameter.Optional }
//);
}
}
}
15 changes: 15 additions & 0 deletions elFinder.Net.Web/Content/elfinder/LICENSE.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
elFinder is issued under a 3-clauses BSD license.

Copyright (c) 2009-2016, Studio 42
All rights reserved.

Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:

1. Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.

2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.

3. Neither the name of the Studio 42 Ltd. nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission.

THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL "STUDIO 42" OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
Loading