definizione preliminare testata pagina

PROJ-ETS/PROJ-ETS/App_Start/BundleConfig.cs

@@ -31,6 +31,13 @@ namespace PROJ_ETS
             // ready for production, use the build tool at http://modernizr.com to pick only the tests you need
             bundles.Add(new ScriptBundle("~/bundles/modernizr").Include(
                 "~/Scripts/modernizr-*"));
+
+            // aggiungo bundle dinamico x less --> css
+            //bundles.Add(new DynamicFolderBundle("less", "*.less"));
+
+            // aggiungo bundle dinamico x coffee --> jscript
+            //bundles.Add(new DynamicFolderBundle("coffee", "*.coffee"));
         }
+
     }
 }

PROJ-ETS/PROJ-ETS/Bundle.config

@@ -2,10 +2,8 @@
 <bundles version="1.0">
     <styleBundle path="~/Content/css">
         <include path="~/Content/Site.css" />
-    </styleBundle>
-    <!--<styleBundle path="~/Content/less">
         <include path="~/Content/Style.css" />
-    </styleBundle>-->
+    </styleBundle>
     <styleBundle path="~/Content/themes/base/css">
         <include path="~/Content/themes/base/jquery.ui.core.css" />
         <include path="~/Content/themes/base/jquery.ui.resizable.css" />

PROJ-ETS/PROJ-ETS/Content/BuildBlocks.css

@@ -1,5 +1,5 @@
 /* zona blocchi Sx/DX */
-.divSx
+/*.divSx
 {
     float: left;
     padding: 0;
@@ -10,7 +10,7 @@
     float: right;
     padding: 0;
     margin: 0;
-}
+}*/
 .divCenter
 {
     float: none;

PROJ-ETS/PROJ-ETS/Content/Site.css

@@ -103,20 +103,20 @@ h5, h6 {
     padding-bottom: 35px;
 }
 
-    .main-content {
-        background: url("../Images/accent.png") no-repeat;
-        padding-left: 10px;
-        padding-top: 30px;
-    }
+.main-content {
+    background: url("../Images/accent.png") no-repeat;
+    padding-left: 10px;
+    padding-top: 30px;
+}
 
-    .featured + .main-content {
-        background: url("../Images/heroAccent.png") no-repeat;
-    }
+.featured + .main-content {
+    background: url("../Images/heroAccent.png") no-repeat;
+}
 
 header .content-wrapper {
-    padding-top: 20px; 
+    padding-top: 20px;
 }
-    
+
 footer {
     clear: both;
     background-color: #e2e2e2;
@@ -128,18 +128,18 @@ footer {
 /* site title
 ----------------------------------------------------------*/
 .site-title {
-    color: #c8c8c8;
+    color: white;
     font-family: Rockwell, Consolas, "Courier New", Courier, monospace;
     font-size: 2.3em;
     margin: 0;
 }
 
-.site-title a, .site-title a:hover, .site-title a:active {
-    background: none;
-    color: #c8c8c8;
-    outline: none;
-    text-decoration: none;
-}
+    .site-title a, .site-title a:hover, .site-title a:active {
+        background: none;
+        color: white;
+        outline: none;
+        text-decoration: none;
+    }
 
 
 /* login
@@ -159,11 +159,11 @@ footer {
         text-decoration: none;
     }
 
-    #login a.username {
-        background: none;
-        margin-left: 0px;
-        text-decoration: underline;
-    }
+        #login a.username {
+            background: none;
+            margin-left: 0px;
+            text-decoration: underline;
+        }
 
     #login ul {
         margin: 0;
@@ -180,7 +180,6 @@ footer {
 ul#menu {
     font-size: 1.3em;
     font-weight: 600;
-    margin: 0 0 5px;
     padding: 0;
     text-align: right;
 }
@@ -189,18 +188,20 @@ ul#menu {
         display: inline;
         list-style: none;
         padding-left: 15px;
+        padding-right: 15px;
+        border-left: 1px solid #DEDEDE;
     }
 
         ul#menu li a {
+            color: #a6dbed;
             background: none;
-            color: #999;
             text-decoration: none;
         }
 
-        ul#menu li a:hover {
-            color: #333;
-            text-decoration: none;
-        }
+            ul#menu li a:hover {
+                color: #ead919;
+                text-decoration: none;
+            }
 
 
 /* page elements
@@ -221,27 +222,27 @@ ul#menu {
         padding: 20px 40px 30px 40px;
     }
 
-        .featured hgroup.title h1, .featured hgroup.title h2 {
-            color: #fff;
-        }
+    .featured hgroup.title h1, .featured hgroup.title h2 {
+        color: #fff;
+    }
 
-        .featured p {
-            font-size: 1.1em;
-        }
+    .featured p {
+        font-size: 1.1em;
+    }
 
 /* page titles */
 hgroup.title {
     margin-bottom: 10px;
 }
 
-hgroup.title h1, hgroup.title h2 {
-    display: inline;
-}
+    hgroup.title h1, hgroup.title h2 {
+        display: inline;
+    }
 
-hgroup.title h2 {
-    font-weight: normal;
-    margin-left: 3px;
-}
+    hgroup.title h2 {
+        font-weight: normal;
+        margin-left: 3px;
+    }
 
 /* features */
 section.feature {
@@ -345,7 +346,7 @@ aside {
 }
 
     #socialLoginForm h2 {
-        margin-bottom:  5px;
+        margin-bottom: 5px;
     }
 
 fieldset.open-auth-providers {
@@ -355,7 +356,7 @@ fieldset.open-auth-providers {
     fieldset.open-auth-providers button {
         margin-bottom: 12px;
     }
-    
+
 /* contact */
 .contact h3 {
     font-size: 1.2em;
@@ -380,7 +381,7 @@ fieldset {
     fieldset legend {
         display: none;
     }
-    
+
     fieldset ol {
         padding: 0;
         list-style: none;
@@ -390,61 +391,61 @@ fieldset {
             padding-bottom: 5px;
         }
 
-    label {
-        display: block;
-        font-size: 1.2em;
-        font-weight: 600;
-    }
+label {
+    display: block;
+    font-size: 1.2em;
+    font-weight: 600;
+}
 
     label.checkbox {
         display: inline;
     }
 
-    input, textarea {
-        border: 1px solid #e2e2e2;
-        background: #fff;
-        color: #333;
-        font-size: 1.2em;
-        margin: 5px 0 6px 0;
-        padding: 5px;
-        width: 300px;
+input, textarea {
+    border: 1px solid #e2e2e2;
+    background: #fff;
+    color: #333;
+    font-size: 1.2em;
+    margin: 5px 0 6px 0;
+    padding: 5px;
+    width: 300px;
+}
+
+textarea {
+    font-family: inherit;
+    width: 500px;
+}
+
+    input:focus, textarea:focus {
+        border: 1px solid #7ac0da;
     }
 
-    textarea {
-        font-family: inherit;
-        width: 500px;
-    }
-    
-        input:focus, textarea:focus {
-            border: 1px solid #7ac0da;
-        }
+input[type="checkbox"] {
+    background: transparent;
+    border: inherit;
+    width: auto;
+}
 
-        input[type="checkbox"] {
-            background: transparent;
-            border: inherit;
-            width: auto;
-        }
-        
-    input[type="submit"],
-    input[type="button"],
-    button {
-        background-color: #d3dce0;
-        border: 1px solid #787878;
-        cursor: pointer;
-        font-size: 1.2em;
-        font-weight: 600;
-        padding: 7px;
-        margin-right: 8px;
-        width: auto;
-    }
+input[type="submit"],
+input[type="button"],
+button {
+    background-color: #d3dce0;
+    border: 1px solid #787878;
+    cursor: pointer;
+    font-size: 1.2em;
+    font-weight: 600;
+    padding: 7px;
+    margin-right: 8px;
+    width: auto;
+}
 
-    td input[type="submit"],
-    td input[type="button"],
-    td button {
-        font-size: 1em;
-        padding: 4px;
-        margin-right: 4px;
-    }
+td input[type="submit"],
+td input[type="button"],
+td button {
+    font-size: 1em;
+    padding: 4px;
+    margin-right: 4px;
+}
 
 /* info and errors */
 .message-info {
@@ -510,7 +511,7 @@ table {
 }
 
 th {
-	font-size: 1.2em;
+    font-size: 1.2em;
     text-align: left;
     border: none 0px;
     padding-left: 0;
@@ -519,39 +520,38 @@ th {
     th a {
         display: block;
         position: relative;
-        
     }
 
-	th a:link, th a:visited, th a:active, th a:hover {
-		color: #333;
-		font-weight: 600;
-		text-decoration: none;
-        padding: 0;
-	}
+        th a:link, th a:visited, th a:active, th a:hover {
+            color: #333;
+            font-weight: 600;
+            text-decoration: none;
+            padding: 0;
+        }
 
-	th a:hover {
-		color: #000;
-	}
+        th a:hover {
+            color: #000;
+        }
 
     th.asc a, th.desc a {
         margin-right: .75em;
     }
-    
-    th.asc a:after, th.desc a:after {
-		display: block;
-        position: absolute;
-        right: 0em;
-        top: 0;
-        font-size: 0.75em;
-	}
 
-	th.asc a:after {
-		content: '▲';
-	}
+        th.asc a:after, th.desc a:after {
+            display: block;
+            position: absolute;
+            right: 0em;
+            top: 0;
+            font-size: 0.75em;
+        }
 
-	th.desc a:after {
-		content: '▼';
-	}
+        th.asc a:after {
+            content: '▲';
+        }
+
+        th.desc a:after {
+            content: '▼';
+        }
 
 td {
     padding: 0.25em 2em 0.25em 0em;
@@ -608,9 +608,9 @@ tr.pager td {
             padding: 0;
         }
 
-        #login a:hover {
-            color: #333;
-        }
+            #login a:hover {
+                color: #333;
+            }
 
     /* menu */
     nav {
@@ -675,12 +675,12 @@ tr.pager td {
                 background: none;
             }
 
-     /* features */
-     section.feature {
+    /* features */
+    section.feature {
         float: none;
         padding: 10px;
         width: auto;
-     }
+    }
 
         section.feature img {
             color: #999;
@@ -694,8 +694,8 @@ tr.pager td {
         width: 90%;
     }
 
-    
-    
+
+
     /* login page */
     #loginForm {
         border-right: none;

PROJ-ETS/PROJ-ETS/Content/Style.css

@@ -5,6 +5,7 @@
 @import url("ExtraComp.css");
 
 @import url("ETS.css");
+/*#region body */
 .bodyMainCenter {
   background-image: url('../images/logo_sw.png');
   vertical-align: middle;
@@ -24,16 +25,6 @@
   height: 100%;
   width: 100%;
 }
-.centerMenu {
-  background-color: White;
-  text-align: center;
-  border-width: thin;
-  border-style: groove;
-  border-color: Blue;
-}
-A:hover {
-  color: red;
-}
 .bodyMain {
   background-image: url('../images/logo_sw.png');
   vertical-align: top;
@@ -82,3 +73,16 @@ A:hover {
   background-attachment: scroll;
   background-repeat: no-repeat;
 }
+/*#endregion */
+/*#region default */
+.centerMenu {
+  background-color: White;
+  text-align: center;
+  border-width: thin;
+  border-style: groove;
+  border-color: Blue;
+}
+A:hover {
+  color: red;
+}
+/*#endregion */

PROJ-ETS/PROJ-ETS/Content/Style.less

@@ -4,6 +4,8 @@
 @import url("ETS.css");
 
 
+/*#region body */
+
 .bodyMainCenter
 {
     background-image: url('../images/logo_sw.png');
@@ -23,19 +25,6 @@
     height: 100%;
     width: 100%;
 }
-.centerMenu
-{
-    background-color: White;
-    text-align: center;
-    border-width: thin;
-    border-style: groove;
-    border-color: Blue;
-}
-A:hover
-{
-    color: red;
-}
-
 .bodyMain
 {
     background-image: url('../images/logo_sw.png');
@@ -93,3 +82,23 @@ A:hover
 
 body {
 }
+
+/*#endregion */
+
+/*#region default */
+
+.centerMenu
+{
+    background-color: White;
+    text-align: center;
+    border-width: thin;
+    border-style: groove;
+    border-color: Blue;
+}
+A:hover
+{
+    color: red;
+}
+
+/*#endregion */
+

PROJ-ETS/PROJ-ETS/Content/Style.min.css

@@ -1 +1 @@
-@import url("MasterPage.css");@import url("BuildBlocks.css");@import url("ExtraComp.css");@import url("ETS.css");.bodyMainCenter{background-image:url('../images/logo_sw.png');vertical-align:middle;border-left:#0d0083 1px solid;text-align:center;height:100%;width:100%;background-position:center;background-attachment:scroll;background-repeat:no-repeat}.bodyCenter{vertical-align:middle;text-align:center;height:100%;width:100%}.centerMenu{background-color:#fff;text-align:center;border-width:thin;border-style:groove;border-color:blue}A:hover{color:red}.bodyMain{background-image:url('../images/logo_sw.png');vertical-align:top;border-left:#0d0083 1px solid;height:100%;width:100%;background-position:center;background-attachment:scroll;background-repeat:no-repeat}.bodyMainEmpty{vertical-align:top;border-left:maroon 1px solid;height:100%;width:100%}.bodyMainWhite{vertical-align:top;border-left:maroon 1px solid;height:100%;width:100%;background-position:center;background-attachment:scroll;background-repeat:no-repeat}.bodyMainWhite a:hover{color:#fff}.bodyMainNoLogo{vertical-align:top;border-left:maroon 1px solid;height:100%;width:100%}.bodyMainLogoPiccolo{background-image:url('../images/sfondoMedio.png');background-position:97% 210px;vertical-align:top;border-left:maroon 1px solid;height:100%;width:100%;background-attachment:scroll;background-repeat:no-repeat}
+@import url("MasterPage.css");@import url("BuildBlocks.css");@import url("ExtraComp.css");@import url("ETS.css");.bodyMainCenter{background-image:url('../images/logo_sw.png');vertical-align:middle;border-left:#0d0083 1px solid;text-align:center;height:100%;width:100%;background-position:center;background-attachment:scroll;background-repeat:no-repeat}.bodyCenter{vertical-align:middle;text-align:center;height:100%;width:100%}.bodyMain{background-image:url('../images/logo_sw.png');vertical-align:top;border-left:#0d0083 1px solid;height:100%;width:100%;background-position:center;background-attachment:scroll;background-repeat:no-repeat}.bodyMainEmpty{vertical-align:top;border-left:maroon 1px solid;height:100%;width:100%}.bodyMainWhite{vertical-align:top;border-left:maroon 1px solid;height:100%;width:100%;background-position:center;background-attachment:scroll;background-repeat:no-repeat}.bodyMainWhite a:hover{color:#fff}.bodyMainNoLogo{vertical-align:top;border-left:maroon 1px solid;height:100%;width:100%}.bodyMainLogoPiccolo{background-image:url('../images/sfondoMedio.png');background-position:97% 210px;vertical-align:top;border-left:maroon 1px solid;height:100%;width:100%;background-attachment:scroll;background-repeat:no-repeat}.centerMenu{background-color:#fff;text-align:center;border-width:thin;border-style:groove;border-color:blue}A:hover{color:red}

PROJ-ETS/PROJ-ETS/PROJ-ETS.csproj

@@ -113,7 +113,9 @@
     <Content Include="Content\ExtraComp.css" />
     <Content Include="Content\MasterPage.css" />
     <Content Include="Content\Site.css" />
-    <Content Include="Content\Style.css" />
+    <Content Include="Content\Style.css">
+      <DependentUpon>Style.less</DependentUpon>
+    </Content>
     <Content Include="Content\Style.min.css">
       <DependentUpon>Style.less</DependentUpon>
     </Content>
@@ -180,9 +182,11 @@
     <Content Include="Content\themes\base\minified\jquery.ui.theme.min.css" />
     <Content Include="Content\themes\base\minified\jquery.ui.tooltip.min.css" />
     <Content Include="Images\accent.png" />
+    <Content Include="Images\bg-menu-main.png" />
     <Content Include="Images\bullet.png" />
     <Content Include="Images\favicon.png" />
     <Content Include="Images\heroAccent.png" />
+    <Content Include="Images\home.png" />
     <Content Include="Images\orderedList0.png" />
     <Content Include="Images\orderedList1.png" />
     <Content Include="Images\orderedList2.png" />

PROJ-ETS/PROJ-ETS/WebMasterPages/Site.Master

@@ -13,7 +13,6 @@
     </asp:PlaceHolder>
     <webopt:BundleReference runat="server" Path="~/Content/css" />
     
-    <%--<webopt:BundleReference ID="brLess" runat="server" Path="~/Content/less" />--%>
     <link href="~/favicon.ico" rel="shortcut icon" type="image/x-icon" />
     <meta name="viewport" content="width=device-width" />
     <asp:ContentPlaceHolder runat="server" ID="HeadContent" />

PROJ-ETS/PROJ-ETS/WebUserControls/mod_testata.ascx

@@ -1,16 +1,35 @@
 <%@ Control Language="C#" AutoEventWireup="true" CodeBehind="mod_testata.ascx.cs" Inherits="PROJ_ETS.WebUserControls.mod_testata" %>
-<%--<% if (false)
+<% if (false)
    { %>
-<link href="../css/BuildBlocks.css" rel="stylesheet" type="text/css" />
-<link href="../css/ETS.css" rel="stylesheet" type="text/css" />
-<link href="../css/ExtraComp.css" rel="stylesheet" type="text/css" />
-<link href="../css/MasterPage.css" rel="stylesheet" type="text/css" />
-<link href="../css/Style.css" rel="stylesheet" type="text/css" />
-<% } %>--%>
-<%--<div class="divCenter areaTitolo">
-    <div class="divSx fontPiccolo" style="padding: 20px 0px 2px 4px;">
+<webopt:BundleReference ID="BundleReference1" runat="server" Path="~/Content/css" />
+<% } %>
+<div class="areaTitolo">
+    <div class="float-left fontPiccolo" style="padding: 20px 0px 2px 4px;">
         <asp:Label runat="server" ID="lblUser" />
     </div>
+    <div class="float-right" style="padding: 10px 6px 10px 6px;">
+        <nav>
+            <ul id="menu">
+                <li><a href="Progetti">Progetti</a></li>
+                <li><a href="Bazaar">Bazaar</a></li>
+                <li><a href="Impostazioni">Impostazioni</a></li>
+                <li><a href="Guida">Guida</a></li>
+            </ul>
+        </nav>
+    </div>
+    <div class="divCenter">
+        <p class="site-title">
+            <asp:Image runat="server" ID="ibHome" ImageUrl="~/images/home.png" Width="32px" Height="32px" />
+            <b>
+                <a id="A2" runat="server" href="~/">PROJ-ETS</a>
+            </b>
+        </p>
+    </div>
+</div>
+
+
+<%--<div class="divCenter areaTitolo">
+    
     <div class="divDx fontPiccolo" style="padding: 0px 4px 2px 0px;">
         <div style="padding-top: 4px; float: right;">
             <asp:LinkButton ID="btnUpdate" runat="server" OnClick="btnUpdate_Click" Text="Update" />
@@ -20,44 +39,5 @@
             <asp:Label runat="server" ID="lblDataOra" />
         </div>
     </div>
-    <div class="divCenter fontTitolo">
-        <asp:Image runat="server" ID="ibHome" ImageUrl="~/images/home.png" Width="32px" Height="32px" />
-        <b>
-            <asp:Label runat="server" ID="lblTitolo" Text="ETS-WebScip" />
-        </b>
-    </div>
-</div>
-<div class="divCenter" style="padding-bottom: 1px;">
-    <asp:Menu ID="Menu1" runat="server" DataSourceID="SiteMapDS" Orientation="Horizontal" RenderingMode="List" StaticDisplayLevels="2" Width="100%" CssClass="menuNav" DynamicHorizontalOffset="2" StaticSubMenuIndent="10px">
-        <DynamicHoverStyle BackColor="#284E98" ForeColor="White" />
-        <DynamicMenuItemStyle HorizontalPadding="5px" VerticalPadding="2px" CssClass="menuItem menuNav" />
-        <DynamicMenuStyle BackColor="#B5C7DE" />
-        <DynamicSelectedStyle CssClass="menuNavSel" />
-        <StaticHoverStyle BackColor="#284E98" ForeColor="White" />
-        <StaticMenuItemStyle VerticalPadding="2px" CssClass="menuItem menuNav" />
-        <StaticSelectedStyle BackColor="#507CD1" />
-    </asp:Menu>
-    <asp:SiteMapDataSource ID="SiteMapDS" runat="server" />
+   
 </div>--%>
-<div class="content-wrapper">
-    <div class="float-left">
-        
-            <a id="A1" runat="server" href="~/">Utente</a>
-        
-    </div>
-    <div class="float-right">
-
-        <nav>
-            <ul id="menu">
-                <li><a href="Default">Home</a></li>
-                <li><a href="About">About</a></li>
-                <li><a href="Contact">Contact</a></li>
-            </ul>
-        </nav>
-    </div>
-    <div class="divCenter fontTitolo">
-        <p class="site-title">
-            <a id="A2" runat="server" href="~/">PROJ-ETS</a>
-        </p>
-    </div>
-</div>

PROJ-ETS/PROJ-ETS/WebUserControls/mod_testata.ascx.cs

@@ -12,7 +12,8 @@ namespace PROJ_ETS.WebUserControls
     {
         protected void Page_Load(object sender, EventArgs e)
         {
-            //lblUser.Text = string.Format("{0} ({1})",utils.obj.currUserCognomeNome, utils.obj.currUserId);
+            // sistemare
+            lblUser.Text = "Current user";// string.Format("{0} ({1})", utils.obj.currUserCognomeNome, utils.obj.currUserId);
             //lblDataOra.Text = DateTime.Now.ToString("dd-MM-yyyy HH:mm:ss");
         }
         /// <summary>

PROJ-ETS/PROJ-ETS/WebUserControls/mod_testata.ascx.designer.cs

@@ -13,13 +13,31 @@ namespace PROJ_ETS.WebUserControls {
     public partial class mod_testata {
         
         /// <summary>
-        /// A1 control.
+        /// BundleReference1 control.
         /// </summary>
         /// <remarks>
         /// Auto-generated field.
         /// To modify move field declaration from designer file to code-behind file.
         /// </remarks>
-        protected global::System.Web.UI.HtmlControls.HtmlAnchor A1;
+        protected global::Microsoft.AspNet.Web.Optimization.WebForms.BundleReference BundleReference1;
+        
+        /// <summary>
+        /// lblUser control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::System.Web.UI.WebControls.Label lblUser;
+        
+        /// <summary>
+        /// ibHome control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::System.Web.UI.WebControls.Image ibHome;
         
         /// <summary>
         /// A2 control.