Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions elFinder.Net.Web/App_Start/RouteConfig.cs
Original file line number Diff line number Diff line change
Expand Up @@ -10,12 +10,12 @@ 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.MapRoute(null, "connector", new { controller = "File", action = "Index" });

routes.MapRoute(
name: "Default",
url: "{controller}/{action}/{id}",
defaults: new { controller = MVC.Home.Name, action = MVC.Home.ActionNames.Index, id = UrlParameter.Optional }
defaults: new { controller = "Home", action = "Index", id = UrlParameter.Optional }
);
}
}
Expand Down
670 changes: 335 additions & 335 deletions elFinder.Net.Web/Content/elfinder/js/i18n/elfinder.jp.js

Large diffs are not rendered by default.

724 changes: 362 additions & 362 deletions elFinder.Net.Web/Content/elfinder/js/i18n/elfinder.ru.js

Large diffs are not rendered by default.

708 changes: 354 additions & 354 deletions elFinder.Net.Web/Content/elfinder/js/i18n/elfinder.zh_CN.js

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions elFinder.Net.Web/Content/metro-bootstrap.min.css

Large diffs are not rendered by default.

35 changes: 33 additions & 2 deletions elFinder.Net.Web/Controllers/HomeController.cs
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ public partial class HomeController : Controller
[GET("")]
public virtual ActionResult Index()
{
DirectoryInfo di = new DirectoryInfo(Server.MapPath("~/Files/MyFolder"));
var di = new DirectoryInfo(Server.MapPath("~/Files/MyFolder"));
// Enumerating all 1st level directories of a given root folder (MyFolder in this case) and retrieving the folders names.
var folders = di.GetDirectories().ToList().Select(d => d.Name);

Expand All @@ -21,9 +21,40 @@ public virtual ActionResult Index()
[GET("FileManager/{subFolder?}")]
public virtual ActionResult Files(string subFolder)
{ // FileViewModel contains the root MyFolder and the selected subfolder if any
FileViewModel model = new FileViewModel() { Folder = "MyFolder", SubFolder = subFolder };
var model = new FileViewModel { Folder = "MyFolder", SubFolder = subFolder };

return View(model);
}

public ActionResult TinyMceFiles(string subFolder)
{
var model = new FileViewModel { Folder = "MyFolder", SubFolder = subFolder };
return View(model);
}

public ActionResult CkEditorFiles(string subFolder)
{
var model = new FileViewModel { Folder = "MyFolder", SubFolder = subFolder };
return View(model);
}

public ActionResult StandAloneFile(string subFolder)
{
var model = new FileViewModel { Folder = "MyFolder", SubFolder = subFolder };
return View(model);
}

#region File dialog
public ActionResult FileBrowser(string subFolder, string caller, string langCode, string type, string fn, string CKEditorFuncNum)
{
ViewBag.Caller = caller;
ViewBag.LangCode = langCode;
ViewBag.Type = type;
ViewBag.Callbackfn = fn;
ViewBag.CKEditorFuncNum = CKEditorFuncNum;
var model = new FileViewModel { Folder = "MyFolder", SubFolder = subFolder };
return View(model);
}
#endregion
}
}
253 changes: 0 additions & 253 deletions elFinder.Net.Web/T4MVC.cs

This file was deleted.

Loading