CodeMaid clean-up

VAR.Focus.Web/Code/Bundler.cs

@@ -12,7 +12,7 @@ namespace VAR.Focus.Web.Code
         private string _path = null;
         private List<string> _files = null;
 
-        #endregion
+        #endregion Declarations
 
         #region Properties
 
@@ -29,7 +29,7 @@ namespace VAR.Focus.Web.Code
             }
         }
 
-        #endregion
+        #endregion Properties
 
         #region Creator
 
@@ -38,7 +38,7 @@ namespace VAR.Focus.Web.Code
             _path = path;
         }
 
-        #endregion
+        #endregion Creator
 
         #region Public methods
 
@@ -58,6 +58,6 @@ namespace VAR.Focus.Web.Code
             }
         }
 
-        #endregion
+        #endregion Public methods
     }
 }

VAR.Focus.Web/Code/ExtensionMethods.cs

@@ -27,7 +27,6 @@ namespace VAR.Focus.Web.Code
             context.Response.Write(strObject);
         }
 
-        #endregion
-
+        #endregion HttpContext
     }
 }

VAR.Focus.Web/Code/GlobalErrorHandler.cs

@@ -40,7 +40,7 @@ namespace VAR.Focus.Web.Code
             context.Response.Write(sbOutput.ToString());
         }
 
-        #endregion
+        #endregion Private methods
 
         #region Public methods
 
@@ -59,6 +59,6 @@ namespace VAR.Focus.Web.Code
             }
         }
 
-        #endregion
+        #endregion Public methods
     }
 }

VAR.Focus.Web/Code/ScriptsBundler.cs

@@ -15,6 +15,6 @@ namespace VAR.Focus.Web.Code
             bundler.WriteResponse(context.Response.OutputStream);
         }
 
-        #endregion
+        #endregion IHttpHandler
     }
 }

VAR.Focus.Web/Code/StylesBundler.cs

@@ -15,6 +15,6 @@ namespace VAR.Focus.Web.Code
             bundler.WriteResponse(context.Response.OutputStream);
         }
 
-        #endregion
+        #endregion IHttpHandler
     }
 }

VAR.Focus.Web/Code/WebSessions.cs

@@ -1,6 +1,4 @@
 using System;
-using System.Collections.Generic;
-using System.Linq;
 using System.Web;
 using VAR.Focus.BusinessLogic;
 using VAR.Focus.BusinessLogic.Entities;
@@ -16,7 +14,7 @@ namespace VAR.Focus.Web.Code
         private string _cookieName = "FocusSID";
         private int _cookieExpirationDays = 30;
 
-        #endregion
+        #endregion Declarations
 
         #region Properties
 
@@ -45,7 +43,7 @@ namespace VAR.Focus.Web.Code
             set { _cookieExpirationDays = value; }
         }
 
-        #endregion
+        #endregion Properties
 
         #region Public methods
 
@@ -86,7 +84,6 @@ namespace VAR.Focus.Web.Code
             return true;
         }
 
-        #endregion
-
+        #endregion Public methods
     }
 }

VAR.Focus.Web/Controls/CLabel.cs

@@ -9,7 +9,7 @@ namespace VAR.Focus.Web.Controls
 
         private string _tagName = "span";
 
-        #endregion
+        #endregion Declarations
 
         #region Properties
 
@@ -19,7 +19,7 @@ namespace VAR.Focus.Web.Controls
             set { _tagName = value; }
         }
 
-        #endregion
+        #endregion Properties
 
         #region Life cycle
 
@@ -36,6 +36,6 @@ namespace VAR.Focus.Web.Controls
             }
         }
 
-        #endregion
+        #endregion Life cycle
     }
 }

VAR.Focus.Web/Controls/CTextBox.cs

@@ -19,7 +19,7 @@ namespace VAR.Focus.Web.Controls
 
         private Control _nextFocusOnEnter = null;
 
-        #endregion
+        #endregion Declarations
 
         #region Properties
 
@@ -53,7 +53,7 @@ namespace VAR.Focus.Web.Controls
             set { _nextFocusOnEnter = value; }
         }
 
-        #endregion
+        #endregion Properties
 
         #region Control life cycle
 
@@ -62,7 +62,7 @@ namespace VAR.Focus.Web.Controls
             PreRender += CTextbox_PreRender;
         }
 
-        void CTextbox_PreRender(object sender, EventArgs e)
+        private void CTextbox_PreRender(object sender, EventArgs e)
         {
             CssClass = CssClassBase;
             if (string.IsNullOrEmpty(_cssClassExtra) == false)
@@ -87,7 +87,6 @@ namespace VAR.Focus.Web.Controls
                     _nextFocusOnEnter.ClientID));
             }
 
-
             // FIX: The framework deletes textbox values on password mode
             if (TextMode == TextBoxMode.Password)
             {
@@ -95,7 +94,7 @@ namespace VAR.Focus.Web.Controls
             }
         }
 
-        #endregion
+        #endregion Control life cycle
 
         #region Public methods
 
@@ -109,7 +108,6 @@ namespace VAR.Focus.Web.Controls
             return _allowEmpty || (string.IsNullOrEmpty(Text) == false);
         }
 
-        #endregion
-
+        #endregion Public methods
     }
 }

VAR.Focus.Web/Controls/CardBoardControl.cs

@@ -25,7 +25,7 @@ namespace VAR.Focus.Web.Controls
 
         private int _timeMoveAnimation = 500;
 
-        #endregion
+        #endregion Declarations
 
         #region Properties
 
@@ -71,7 +71,7 @@ namespace VAR.Focus.Web.Controls
             set { _timeMoveAnimation = value; }
         }
 
-        #endregion
+        #endregion Properties
 
         #region Control Life cycle
 
@@ -80,12 +80,12 @@ namespace VAR.Focus.Web.Controls
             Init += ChatControl_Init;
         }
 
-        void ChatControl_Init(object sender, EventArgs e)
+        private void ChatControl_Init(object sender, EventArgs e)
         {
             InitializeControls();
         }
 
-        #endregion
+        #endregion Control Life cycle
 
         #region Private methods
 
@@ -124,6 +124,6 @@ namespace VAR.Focus.Web.Controls
             Controls.Add(liScript);
         }
 
-        #endregion
+        #endregion Private methods
     }
 }

VAR.Focus.Web/Controls/CardBoardHandler.cs

@@ -15,7 +15,7 @@ namespace VAR.Focus.Web.Controls
         private static object _monitor = new object();
         private static Dictionary<int, CardBoard> _cardBoards = new Dictionary<int, CardBoard>();
 
-        #endregion
+        #endregion Declarations
 
         #region IHttpHandler
 
@@ -50,7 +50,7 @@ namespace VAR.Focus.Web.Controls
             }
         }
 
-        #endregion
+        #endregion IHttpHandler
 
         #region Private methods
 
@@ -195,6 +195,6 @@ namespace VAR.Focus.Web.Controls
             lock (_monitor) { Monitor.PulseAll(_monitor); }
         }
 
-        #endregion
+        #endregion Private methods
     }
 }

VAR.Focus.Web/Controls/ChatControl.cs

@@ -26,7 +26,7 @@ namespace VAR.Focus.Web.Controls
         private Panel _divChatContainer = null;
         private Panel _divChatTitleBar = null;
 
-        #endregion
+        #endregion Declarations
 
         #region Properties
 
@@ -80,7 +80,7 @@ namespace VAR.Focus.Web.Controls
             }
         }
 
-        #endregion
+        #endregion Properties
 
         #region Control Life cycle
 
@@ -89,12 +89,12 @@ namespace VAR.Focus.Web.Controls
             Init += ChatControl_Init;
         }
 
-        void ChatControl_Init(object sender, EventArgs e)
+        private void ChatControl_Init(object sender, EventArgs e)
         {
             InitializeControls();
         }
 
-        #endregion
+        #endregion Control Life cycle
 
         #region Private methods
 
@@ -165,6 +165,6 @@ namespace VAR.Focus.Web.Controls
             Controls.Add(liScript);
         }
 
-        #endregion
+        #endregion Private methods
     }
 }

VAR.Focus.Web/Controls/ChatHandler.cs

@@ -15,7 +15,7 @@ namespace VAR.Focus.Web.Controls
         private static object _monitor = new object();
         private static Dictionary<string, MessageBoard> _chatBoards = new Dictionary<string, MessageBoard>();
 
-        #endregion
+        #endregion Declarations
 
         #region IHttpHandler
 
@@ -43,7 +43,7 @@ namespace VAR.Focus.Web.Controls
             }
         }
 
-        #endregion
+        #endregion IHttpHandler
 
         #region Private methods
 
@@ -120,6 +120,6 @@ namespace VAR.Focus.Web.Controls
             context.ResponseObject(new OperationStatus { IsOK = true, Message = "Message sent" });
         }
 
-        #endregion
+        #endregion Private methods
     }
 }

VAR.Focus.Web/Controls/IValidableControl.cs

@@ -1,5 +1,4 @@
-
-namespace VAR.Focus.Web.Controls
+namespace VAR.Focus.Web.Controls
 {
     public interface IValidableControl
     {

VAR.Focus.Web/GlobalRouter.cs

@@ -78,7 +78,7 @@ namespace VAR.Focus.Web
             return null;
         }
 
-        #endregion
+        #endregion Handlers
 
         #region IHttpHandler
 
@@ -103,7 +103,7 @@ namespace VAR.Focus.Web
             }
         }
 
-        #endregion
+        #endregion IHttpHandler
 
         #region Private methods
 
@@ -144,6 +144,6 @@ namespace VAR.Focus.Web
             handler.ProcessRequest(context);
         }
 
-        #endregion
+        #endregion Private methods
     }
 }

VAR.Focus.Web/Globals.cs

@@ -1,5 +1,4 @@
-
-using System.Collections.Generic;
+using System.Collections.Generic;
 
 namespace VAR.Focus.Web
 {
@@ -8,8 +7,8 @@ namespace VAR.Focus.Web
         public const string Title = "Focus";
         public const string TitleSeparator = " :: ";
         public const string Author = "Valeriano Alfonso Rodriguez";
-        public const string Copyright = "Copyright (c) 2015 by Valeriano Alfonso, All Right Reserved";
+        public const string Copyright = "Copyright (c) 2015-2017 by Valeriano Alfonso, All Right Reserved";
         public const string DefaultHandler = "FrmBoard";
-        public static List<string> AllowedExtensions = new List<string>{ ".png", ".jpg", ".jpeg", ".gif", ".ico", ".wav", ".mp3", ".ogg", ".mp4", ".webm", ".webp" };
+        public static List<string> AllowedExtensions = new List<string> { ".png", ".jpg", ".jpeg", ".gif", ".ico", ".wav", ".mp3", ".ogg", ".mp4", ".webm", ".webp", ".mkv", ".avi" };
     }
 }

VAR.Focus.Web/Pages/FormUtils.cs

@@ -62,7 +62,8 @@ namespace VAR.Focus.Web.Pages
             return true;
         }
 
-        public static bool Controls_AreValid(ControlCollection controls) {
+        public static bool Controls_AreValid(ControlCollection controls)
+        {
             bool valid = true;
             foreach (Control control in controls)
             {

VAR.Focus.Web/Pages/FrmBoard.cs

@@ -17,7 +17,7 @@ namespace VAR.Focus.Web.Pages
         private CTextBox _txtTitle = new CTextBox { ID = "txtTitle", CssClassExtra = "width100pc", AllowEmpty = false };
         private CTextBox _txtDescription = new CTextBox { ID = "txtDescription", CssClassExtra = "width100pc", TextMode = TextBoxMode.MultiLine };
 
-        #endregion
+        #endregion Declarations
 
         #region Life cycle
 
@@ -26,7 +26,7 @@ namespace VAR.Focus.Web.Pages
             Init += FrmBoard_Init;
         }
 
-        void FrmBoard_Init(object sender, EventArgs e)
+        private void FrmBoard_Init(object sender, EventArgs e)
         {
             string strIDBoard = Context.GetRequestParm("idBoard");
             if (String.IsNullOrEmpty(strIDBoard) == false)
@@ -43,11 +43,11 @@ namespace VAR.Focus.Web.Pages
             }
         }
 
-        #endregion
+        #endregion Life cycle
 
         #region UI Events
 
-        void btnAddBoard_Click(object sender, EventArgs e)
+        private void btnAddBoard_Click(object sender, EventArgs e)
         {
             if (FormUtils.Controls_AreValid(Controls) == false) { return; }
 
@@ -90,7 +90,7 @@ namespace VAR.Focus.Web.Pages
             }
         }
 
-        #endregion
+        #endregion UI Events
 
         #region Private methods
 
@@ -169,7 +169,6 @@ namespace VAR.Focus.Web.Pages
             _txtDescription.PlaceHolder = "Description";
             pnlBoardAdd.Controls.Add(FormUtils.CreatePanel("formRow", btnAddBoard));
             Controls.Add(pnlBoardAdd);
-
         }
 
         private void FrmBoard_InitBoard()
@@ -195,6 +194,6 @@ namespace VAR.Focus.Web.Pages
             Controls.Add(chatControl);
         }
 
-        #endregion
+        #endregion Private methods
     }
 }

VAR.Focus.Web/Pages/FrmBoardEdit.cs

@@ -18,7 +18,7 @@ namespace VAR.Focus.Web.Pages
         private CButton _btnSave = new CButton { ID = "btnSave" };
         private CButton _btnExit = new CButton { ID = "btnExit" };
 
-        #endregion
+        #endregion Declarations
 
         #region Page life cycle
 
@@ -36,7 +36,7 @@ namespace VAR.Focus.Web.Pages
             }
         }
 
-        void FrmBoardEdit_Init(object sender, EventArgs e)
+        private void FrmBoardEdit_Init(object sender, EventArgs e)
         {
             string strIDBoard = Context.GetRequestParm("idBoard");
             if (String.IsNullOrEmpty(strIDBoard) == false)
@@ -50,7 +50,7 @@ namespace VAR.Focus.Web.Pages
             InitializeComponents();
         }
 
-        #endregion
+        #endregion Page life cycle
 
         #region UI Events
 
@@ -76,7 +76,7 @@ namespace VAR.Focus.Web.Pages
             }
         }
 
-        #endregion
+        #endregion UI Events
 
         #region Private methods
 
@@ -113,7 +113,6 @@ namespace VAR.Focus.Web.Pages
             _txtDescription.Text = board.Description;
         }
 
-        #endregion
-
+        #endregion Private methods
     }
 }

VAR.Focus.Web/Pages/FrmEcho.cs

@@ -20,6 +20,6 @@ namespace VAR.Focus.Web.Pages
             context.Response.Write("</code></pre>");
         }
 
-        #endregion
+        #endregion IHttpHandler
     }
 }

VAR.Focus.Web/Pages/FrmError.cs

@@ -10,9 +10,9 @@ namespace VAR.Focus.Web.Pages
     {
         #region Declarations
 
-        Exception _ex = null;
+        private Exception _ex = null;
 
-        #endregion
+        #endregion Declarations
 
         #region Page life cycle
 
@@ -22,12 +22,12 @@ namespace VAR.Focus.Web.Pages
             Init += FrmError_Init;
         }
 
-        void FrmError_Init(object sender, EventArgs e)
+        private void FrmError_Init(object sender, EventArgs e)
         {
             InitializeControls();
         }
 
-        #endregion
+        #endregion Page life cycle
 
         #region Private methods
 
@@ -60,6 +60,6 @@ namespace VAR.Focus.Web.Pages
             }
         }
 
-        #endregion
+        #endregion Private methods
     }
 }

VAR.Focus.Web/Pages/FrmLogin.cs

@@ -14,7 +14,7 @@ namespace VAR.Focus.Web.Pages
         private CTextBox _txtPassword = new CTextBox { ID = "txtPassword", CssClassExtra = "width150px", AllowEmpty = false, TextMode = TextBoxMode.Password };
         private CButton _btnLogin = new CButton { ID = "btnLogin" };
 
-        #endregion
+        #endregion Declarations
 
         #region Page life cycle
 
@@ -29,7 +29,7 @@ namespace VAR.Focus.Web.Pages
             InitializeControls();
         }
 
-        #endregion
+        #endregion Page life cycle
 
         #region UI Events
 
@@ -47,7 +47,7 @@ namespace VAR.Focus.Web.Pages
             Response.Redirect(Globals.DefaultHandler);
         }
 
-        #endregion
+        #endregion UI Events
 
         #region Private methods
 
@@ -72,6 +72,6 @@ namespace VAR.Focus.Web.Pages
             Controls.Add(FormUtils.CreateField(String.Empty, new HyperLink { Text = "Register user", NavigateUrl = "FrmRegister" }));
         }
 
-        #endregion
+        #endregion Private methods
     }
 }

VAR.Focus.Web/Pages/FrmRegister.cs

@@ -21,7 +21,7 @@ namespace VAR.Focus.Web.Pages
         private CLabel _lblSuccess = new CLabel { ID = "lblSuccess" };
         private CButton _btnExitSuccess = new CButton { ID = "btnExitSuccess" };
 
-        #endregion
+        #endregion Declarations
 
         #region Page life cycle
 
@@ -31,16 +31,16 @@ namespace VAR.Focus.Web.Pages
             Init += FrmRegister_Init;
         }
 
-        void FrmRegister_Init(object sender, EventArgs e)
+        private void FrmRegister_Init(object sender, EventArgs e)
         {
             InitializeComponents();
         }
 
-        #endregion
+        #endregion Page life cycle
 
         #region UI Events
 
-        void btnRegister_Click(object sender, EventArgs e)
+        private void btnRegister_Click(object sender, EventArgs e)
         {
             if (FormUtils.Controls_AreValid(Controls) == false) { return; }
 
@@ -63,12 +63,12 @@ namespace VAR.Focus.Web.Pages
             _lblSuccess.Text = String.Format("User {0} created sucessfully", user.Name);
         }
 
-        void btnExit_Click(object sender, EventArgs e)
+        private void btnExit_Click(object sender, EventArgs e)
         {
             Response.Redirect(Globals.DefaultHandler);
         }
 
-        #endregion
+        #endregion UI Events
 
         #region Private methods
 
@@ -115,10 +115,8 @@ namespace VAR.Focus.Web.Pages
             _btnExitSuccess.Text = "Exit";
             _btnExitSuccess.Click += btnExit_Click;
             _pnlSuccess.Controls.Add(FormUtils.CreateField(String.Empty, _btnExitSuccess));
-
         }
 
-        #endregion
-
+        #endregion Private methods
     }
 }

VAR.Focus.Web/Pages/PageCommon.cs

@@ -25,7 +25,7 @@ namespace VAR.Focus.Web.Pages
         private bool _mustBeAutenticated = true;
         private User _currentUser = null;
 
-        #endregion
+        #endregion Declarations
 
         #region Properties
 
@@ -45,7 +45,7 @@ namespace VAR.Focus.Web.Pages
             get { return _currentUser; }
         }
 
-        #endregion
+        #endregion Properties
 
         #region Life cycle
 
@@ -56,7 +56,7 @@ namespace VAR.Focus.Web.Pages
             PreRender += PageCommon_PreRender;
         }
 
-        void PageCommon_PreInit(object sender, EventArgs e)
+        private void PageCommon_PreInit(object sender, EventArgs e)
         {
             Session session = WebSessions.Current.Session_GetCurrent(Context);
             if (session != null)
@@ -73,22 +73,22 @@ namespace VAR.Focus.Web.Pages
             }
         }
 
-        void PageCommon_Init(object sender, EventArgs e)
+        private void PageCommon_Init(object sender, EventArgs e)
         {
             CreateControls();
         }
 
-        void PageCommon_PreRender(object sender, EventArgs e)
+        private void PageCommon_PreRender(object sender, EventArgs e)
         {
             _head.Title = string.IsNullOrEmpty(Title) ? Globals.Title : String.Format("{0}{1}{2}", Title, Globals.TitleSeparator, Globals.Title);
             _btnLogout.Visible = (_currentUser != null);
         }
 
-        #endregion
+        #endregion Life cycle
 
         #region UI Events
 
-        void btnLogout_Click(object sender, EventArgs e)
+        private void btnLogout_Click(object sender, EventArgs e)
         {
             WebSessions.Current.Session_FinalizeCurrent(Context);
             _currentUser = null;
@@ -98,7 +98,7 @@ namespace VAR.Focus.Web.Pages
             }
         }
 
-        #endregion
+        #endregion UI Events
 
         #region Private methods
 
@@ -125,7 +125,6 @@ namespace VAR.Focus.Web.Pages
             _head.Controls.Add(new LiteralControl(String.Format("<script type=\"text/javascript\" src=\"ScriptsBundler?v={0}\"></script>\n", version)));
             _head.Controls.Add(new LiteralControl(String.Format("<link href=\"StylesBundler?v={0}\" type=\"text/css\" rel=\"stylesheet\"/>\n", version)));
 
-
             _body = new HtmlGenericControl("body");
             html.Controls.Add(_body);
             _form = new HtmlForm { ID = "formMain" };
@@ -159,6 +158,6 @@ namespace VAR.Focus.Web.Pages
             _form.Controls.Add(_pnlContainer);
         }
 
-        #endregion
+        #endregion Private methods
     }
 }

VAR.Focus.Web/Scripts/01. Base.js

@@ -1,5 +1,4 @@
-
-////////////////////////
+////////////////////////
 //  GetElement
 //
 function GetElement(element) {
@@ -53,7 +52,6 @@ function ElementToggleClass(element, className) {
     }
 }
 
-
 function escapeHTML(s) {
     return s.replace(/&/g, '&')
             .replace(/"/g, '"')
@@ -67,7 +65,6 @@ function fixedEncodeURIComponent(str) {
     });
 }
 
-
 ////////////////////////
 // localStorage polyfill
 //

VAR.Focus.Web/Scripts/02. Ajax.js

@@ -1,5 +1,4 @@
-
-function SendRequest(url, data, onData, onError) {
+function SendRequest(url, data, onData, onError) {
     var xhr = new XMLHttpRequest();
     if (data) {
         url += "?" + GetDataQueryString(data);

VAR.Focus.Web/Scripts/05. Cards.js

@@ -1,5 +1,4 @@
-
-var CosineInterpolation = function (f) {
+var CosineInterpolation = function (f) {
     return 1.0 - (Math.cos(f * Math.PI) + 1.0) / 2.0;
 };
 

VAR.Focus.Web/Scripts/10. Chat.js

@@ -81,7 +81,6 @@
 
     var RequestChatData = function () {
         var ReciveChatData = function (responseText) {
-
             // Mark as connected
             if (cfg.Connected == false) {
                 if (cfg.Minimized) {
@@ -134,7 +133,6 @@
             }, 20);
         };
         var ErrorChatData = function () {
-
             // Mark as disconnected
             cfg.lblTitle.innerHTML = cfg.Texts.Disconnected;
             cfg.lblTitle.className = "titleChatDisconnected";

VAR.Focus.Web/Styles/00. Reset.css

@@ -1,5 +1,4 @@
-
-/* Reset */
+/* Reset */
 * {
     margin: 0;
     padding: 0;
@@ -14,4 +13,3 @@ input[type="reset"]::-moz-focus-inner {
     padding: 0 !important;
     border: 0 none !important;
 }
-

VAR.Focus.Web/Styles/01. base.css

@@ -1,5 +1,4 @@
-
-html {
+html {
     height: 100%;
 }
 
@@ -84,7 +83,6 @@ h3 {
     box-shadow: 0 0 10px rgb(0,0,0);
 }
 
-
 .formColumn {
     display: inline-block;
     font-size: 0;
@@ -101,6 +99,9 @@ h3 {
     font-family: 'Segoe UI', Tahoma, Geneva, Verdana, sans-serif;
     font-size: 12px;
     text-shadow: 0 1px 1px rgba(255,255,255,0.5);
+    text-align: right;
+    padding-right: 20px;
+    vertical-align: top;
 }
 
     .formLabel span:last-child::after {
@@ -144,7 +145,6 @@ textarea.textbox {
         border: solid 1px black;
     }
 
-
 .button {
     padding: 5px;
     box-shadow: 0px 0px 10px rgba(0,0,0,0.5), inset 0 2px 5px rgba(255,255,255,1), inset 0 -2px 5px rgba(128,128,128,1);

VAR.Focus.Web/Styles/05. Cards.css

@@ -62,7 +62,6 @@
             box-shadow: 0 2px 4px rgba(0,0,0,0.4) inset, 0 -2px 3px rgba(255,255,255,1) inset;
         }
 
-
 .divCard {
     position: absolute;
     background-color: rgb(255,255,0);

VAR.Focus.Web/Styles/10. Chat.css

@@ -141,7 +141,6 @@
     text-align: left;
 }
 
-
 .chatButton {
     box-sizing: border-box;
     padding: 5px;