diff --git a/GPW_Admin/GPW_Admin.csproj b/GPW_Admin/GPW_Admin.csproj index a8cb10f..660c736 100644 --- a/GPW_Admin/GPW_Admin.csproj +++ b/GPW_Admin/GPW_Admin.csproj @@ -59,8 +59,8 @@ ..\packages\Antlr.3.5.0.2\lib\Antlr3.Runtime.dll True - - ..\packages\AspNet.ScriptManager.bootstrap.4.5.2\lib\net45\AspNet.ScriptManager.bootstrap.dll + + ..\packages\AspNet.ScriptManager.bootstrap.4.5.3\lib\net45\AspNet.ScriptManager.bootstrap.dll ..\packages\AspNet.ScriptManager.jQuery.3.5.1\lib\net45\AspNet.ScriptManager.jQuery.dll @@ -519,6 +519,7 @@ + @@ -805,6 +806,13 @@ spostaOre.aspx + + Test.aspx + ASPXCodeBehind + + + Test.aspx + timbratureMensili.aspx ASPXCodeBehind diff --git a/GPW_Admin/GPW_Admin.csproj.user b/GPW_Admin/GPW_Admin.csproj.user index 44a4d1c..0651eec 100644 --- a/GPW_Admin/GPW_Admin.csproj.user +++ b/GPW_Admin/GPW_Admin.csproj.user @@ -7,10 +7,10 @@ false ShowAllFiles IIS02 + Release|Any CPU - Debug|Any CPU diff --git a/GPW_Admin/Test.aspx b/GPW_Admin/Test.aspx index 343aa56..c931225 100644 --- a/GPW_Admin/Test.aspx +++ b/GPW_Admin/Test.aspx @@ -119,5 +119,83 @@ col-2 + + + col-6 + + + col-6 + + + + + col-4 + + + col-4 + + + col-4 + + + + + col-2 + + + col-2 + + + col-2 + + + col-2 + + + col-2 + + + col-2 + + + + + col-6 + + + col-6 + + + + + col-4 + + + col-4 + + + col-4 + + + + + col-2 + + + col-2 + + + col-2 + + + col-2 + + + col-2 + + + col-2 + + diff --git a/GPW_Admin/WebMasterPages/BMP.Master b/GPW_Admin/WebMasterPages/BMP.Master index f841bb7..078788b 100644 --- a/GPW_Admin/WebMasterPages/BMP.Master +++ b/GPW_Admin/WebMasterPages/BMP.Master @@ -8,13 +8,13 @@ - + <%-- - - + + --%> GPW <%: Page.Title %> @@ -63,13 +63,16 @@ - + + + + <%: traduci(titolo) %> - + @@ -82,7 +85,11 @@ + + + + - \ No newline at end of file +