Simple Enhancement for User's password

README.md

@@ -26,6 +26,8 @@ Lastly you need to modify the `my.config` file which contains your login informa
 
 FunnelWeb is licensed under the New BSD license.
 
+# Merged with original master @May 28, 2013
+
 ==============================================================================
 
 Copyright (c) 2009, FunnelWeb Contributors

src/FunnelWeb.Web/App_Start/BundleConfig.cs

@@ -22,12 +22,14 @@ public static void RegisterBundles(BundleCollection bundles)
             bundles.Add(new ScriptBundle("~/bundles/jsdate").Include("~/Scripts/jsdate.js"));
             bundles.Add(new ScriptBundle("~/bundles/showdown").Include("~/Scripts/showdown.js"));
             bundles.Add(new ScriptBundle("~/bundles/taggy").Include("~/Scripts/taggy.js"));
-            bundles.Add(new ScriptBundle("~/bundles/prettify").Include("~/Scripts/Prettify/prettify.js", "~/Scripts/Prettify/lang-*"));
+            bundles.Add( new Bundle( "~/bundles/prettify" ).Include( "~/Scripts/Prettify/prettify.js", "~/Scripts/Prettify/lang-*" ) );
+
             bundles.Add(new ScriptBundle("~/bundles/site").Include("~/Scripts/site.js"));
             bundles.Add(new ScriptBundle("~/bundles/wmd").Include("~/Scripts/wmd.js"));
 
-            bundles.Add(new StyleBundle("~/Content/css").Include("~/Content/themes/base/Base.css"));
-            bundles.Add(new StyleBundle("~/Content/adminCss").Include("~/Content/themes/base/Base.css", "~/Content/themes/base/Admin.css"));
+           bundles.Add(new StyleBundle("~/Content/themes/base/baseCss").Include("~/Content/themes/base/Base.css"));
+           bundles.Add(new StyleBundle("~/Content/themes/base/adminCss").Include("~/Content/themes/base/Base.css", "~/Content/themes/base/Admin.css"));
+
 
             bundles.Add(new StyleBundle("~/Content/themes/base/css").Include(
                         "~/Content/themes/base/jquery.ui.core.css",

src/FunnelWeb.Web/Application/Extensions/MarkupExtensions.cs

@@ -164,16 +164,16 @@ public static IHtmlString Date(this HtmlHelper html, object value)
         {
             var date = (DateTime)value;
             return MvcHtmlString.Create(string.Format("<span class=\"date\" title=\"{0}\">{1}</span>",
-                date.ToString("dd MMM, yyyy HH:mm"),
-                date.ToString("dd MMM, yyyy hh:mm tt")));
+                date.ToString( "yyyy-MM-dd HH:mm" ),
+                date.ToString( "yyyy-MM-dd HH:mm" ) ) );
         }
 
         public static IHtmlString DateWithoutTime(this HtmlHelper html, object value)
         {
             var date = (DateTime)value;
             return MvcHtmlString.Create(string.Format("<span class=\"date\" title=\"{0}\">{1}</span>",
-                date.ToString("dd MMM, yyyy"),
-                date.ToString("dd MMM, yyyy")));
+                date.ToString( "yyyy-MM-dd" ),
+                date.ToString( "yyyy-MM-dd" ) ) );
         }
 
         public static MvcHtmlString RenderTrusted(this HtmlHelper html, object content, string format)

src/FunnelWeb.Web/Application/Mvc/ViewBundleRegistrar.cs

@@ -49,9 +49,10 @@ public static void RegisterViewBundles(BundleCollection bundles)
         {
             string path = HttpContext.Current.Server.MapPath("Scripts/Views");
 
-            foreach (string jsFile in Directory.EnumerateFiles(path, "*.js", SearchOption.AllDirectories))
-            {
-                bundles.Add(CreateScriptBundle(jsFile, path));
+            if ( Directory.Exists( path ) ) {
+              foreach ( string jsFile in Directory.EnumerateFiles( path, "*.js", SearchOption.AllDirectories ) ) {
+                bundles.Add( CreateScriptBundle( jsFile, path ) );
+              }
             }
         }
 

src/FunnelWeb.Web/Areas/Admin/Controllers/WikiAdminController.cs

@@ -72,18 +72,21 @@ public virtual ActionResult Edit(EntryRevision model)
                 return View(model);
             }
 
-            // Does an entry with that name already exist?
-            var existing = Repository.FindFirstOrDefault(new EntryByNameQuery(model.Name));
-            if (existing != null && existing.Id != model.Id)
+            var author = Authenticator.GetName();
+            var entry = Repository.Get<Entry>( model.Id );
+            if ( entry == null && CurrentEntryExistsWithName( model.Name ) )
             {
                 model.SelectedTags = GetEditTags(model);
-                ModelState.AddModelError("PageExists", string.Format("A page with SLUG '{0}' already exists. You should edit that page instead.", model.Title));
+                ModelState.AddModelError( "PageExists", string.Format( "A page with SLUG '{0}' already exists. You should edit that page instead", model.Name ) );
                 return View(model);
             }
+            if ( entry == null && CurrentEntryExistsWithName( model.Title ) && model.Name == "" ) {
+              model.SelectedTags = GetEditTags( model );
+              ModelState.AddModelError("PageExists", string.Format("A page with SLUG '{0}' already exists. Please add a unique SLUG here.", model.Title)); 
+              return View(model);
+            }
 
-            var author = Authenticator.GetName();
-
-            var entry = Repository.Get<Entry>(model.Id) ?? new Entry { Author = author };
+            entry = entry ?? new Entry { Author = author };
             entry.Name = string.IsNullOrWhiteSpace(model.Name) ? model.Title.Slugify() : model.Name.ToString();
             entry.PageTemplate = string.IsNullOrEmpty(model.PageTemplate) ? null : model.PageTemplate;
             entry.Title = model.Title ?? string.Empty;
@@ -130,6 +133,10 @@ public virtual ActionResult Edit(EntryRevision model)
             return RedirectToAction("Page", "Wiki", new { Area = "", page = entry.Name});
         }
 
+        private bool CurrentEntryExistsWithName( string name ) {
+          return Repository.FindFirstOrDefault( new EntryByNameQuery( name ) ) != null;
+        }
+
         private List<Tag> GetEditTags(EntryRevision model)
         {
             var tagList = new List<Tag>();

src/FunnelWeb.Web/Areas/Admin/Views/Admin/Comments.cshtml

@@ -1,4 +1,4 @@
-@model CommentsModel
+@model FunnelWeb.Web.Areas.Admin.Views.Admin.CommentsModel
 @{
   ViewBag.Title = "FunnelWeb Administration - Comments";
   Layout = "~/Areas/Admin/Views/Shared/_Private.cshtml";

src/FunnelWeb.Web/Areas/Admin/Views/Admin/PageList.cshtml

@@ -1,4 +1,4 @@
-@model PageListModel
+@model FunnelWeb.Web.Areas.Admin.Views.Admin.PageListModel
 @{
     ViewBag.Title = "FunnelWeb Administration - Page List";
     Layout = "~/Areas/Admin/Views/Shared/_Private.cshtml";

src/FunnelWeb.Web/Areas/Admin/Views/Admin/Pingbacks.cshtml

@@ -1,4 +1,4 @@
-@model PingbacksModel
+@model FunnelWeb.Web.Areas.Admin.Views.Admin.PingbacksModel
 @{
     ViewBag.Title = "FunnelWeb Administration - Pingbacks";
     Layout = "~/Areas/Admin/Views/Shared/_Private.cshtml";

src/FunnelWeb.Web/Areas/Admin/Views/Admin/Task.cshtml

@@ -1,4 +1,4 @@
-@model TaskModel
+@model FunnelWeb.Web.Areas.Admin.Views.Admin.TaskModel
 @{
     ViewBag.Title = "FunnelWeb Administration - Task Details";
     Layout = "~/Areas/Admin/Views/Shared/_Private.cshtml";

src/FunnelWeb.Web/Areas/Admin/Views/Admin/Tasks.cshtml

@@ -1,4 +1,4 @@
-@model TasksModel
+@model FunnelWeb.Web.Areas.Admin.Views.Admin.TasksModel
 @{
     ViewBag.Title = "FunnelWeb Administration - Task List";
     Layout = "~/Areas/Admin/Views/Shared/_Private.cshtml";

src/FunnelWeb.Web/Areas/Admin/Views/Shared/_Private.cshtml

@@ -9,7 +9,7 @@
     <title>@(ViewBag.Title == null ? "" : (ViewBag.Title + " - "))@Html.Settings().SiteTitle
     </title>
     <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
-    @Styles.Render("~/Content/adminCss")
+    @Styles.Render("~/Content/themes/base/adminCss")
     @Styles.Render("~/Content/themes/base/css")
     @Scripts.Render("~/bundles/jquery")
 

src/FunnelWeb.Web/My.config

@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <funnelweb xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
-  <setting key="funnelweb.configuration.database.connection" value="database=FunnelWeb;server=.\SQLEXPRESS;trusted_connection=true;" />
-  <setting key="funnelweb.configuration.database.schema" value="dbo" />
-  <setting key="funnelweb.configuration.authentication.username" value="test" />
-  <setting key="funnelweb.configuration.authentication.password" value="test" />
+  <setting key="funnelweb.configuration.database.connection" value="database=funnelweb;server=.\SQLEXPRESS;trusted_connection=true;" />
+  <setting key="funnelweb.configuration.database.schema" value="funnel" />
+  <setting key="funnelweb.configuration.authentication.username" value="user_install" />
+  <setting key="funnelweb.configuration.authentication.password" value="pw_install_1234567" />
   <setting key="funnelweb.configuration.database.provider" value="sql" />
 </funnelweb>

src/FunnelWeb.Web/Scripts/Prettify/lang-clj.js

@@ -14,5 +14,5 @@
  limitations under the License.
 */
 var a=null;
-PR.registerLangHandler(PR.createSimpleLexer([["opn",/^[([{]+/,a,"([{"],["clo",/^[)\]}]+/,a,")]}"],["com",/^;[^\n\r]*/,a,";"],["pln",/^[\t\n\r \xa0]+/,a,"\t\n\r \xa0"],["str",/^"(?:[^"\\]|\\[\S\s])*(?:"|$)/,a,'"']],[["kwd",/^(?:def|if|do|let|quote|var|fn|loop|recur|throw|try|monitor-enter|monitor-exit|defmacro|defn|defn-|macroexpand|macroexpand-1|for|doseq|dosync|dotimes|and|or|when|not|assert|doto|proxy|defstruct|first|rest|cons|defprotocol|deftype|defrecord|reify|defmulti|defmethod|meta|with-meta|ns|in-ns|create-ns|import|intern|refer|alias|namespace|resolve|ref|deref|refset|new|set!|memfn|to-array|into-array|aset|gen-class|reduce|map|filter|find|nil?|empty?|hash-map|hash-set|vec|vector|seq|flatten|reverse|assoc|dissoc|list|list?|disj|get|union|difference|intersection|extend|extend-type|extend-protocol|prn)\b/,a],
+PR.registerLangHandler(PR.createSimpleLexer([["opn",/^[([{]+/,a,"([{"],["clo",/^[)\]}]+/,a,")]}"],["com",/^;[^\n\r]*/,a,";"],["pln",/^[\t\n\r \xa0]+/,a,"\t\n\r \u00a0"],["str",/^"(?:[^"\\]|\\[\S\s])*(?:"|$)/,a,'"']],[["kwd",/^(?:def|if|do|let|quote|var|fn|loop|recur|throw|try|monitor-enter|monitor-exit|defmacro|defn|defn-|macroexpand|macroexpand-1|for|doseq|dosync|dotimes|and|or|when|not|assert|doto|proxy|defstruct|first|rest|cons|defprotocol|deftype|defrecord|reify|defmulti|defmethod|meta|with-meta|ns|in-ns|create-ns|import|intern|refer|alias|namespace|resolve|ref|deref|refset|new|set!|memfn|to-array|into-array|aset|gen-class|reduce|map|filter|find|nil?|empty?|hash-map|hash-set|vec|vector|seq|flatten|reverse|assoc|dissoc|list|list?|disj|get|union|difference|intersection|extend|extend-type|extend-protocol|prn)\b/,a],
 ["typ",/^:[\dA-Za-z-]+/]]),["clj"]);