From 18e0a286035a2bcab6f47cbc8e0f58dc45bd207e Mon Sep 17 00:00:00 2001
From: "Samuele E. Locatelli" <samuele@steamware.net>
Date: Sat, 3 Mar 2018 11:02:11 +0100
Subject: [PATCH] Inizio nuova vers + udpate voc + appunti x About page

---
 CMS_SC/About.aspx             | 18 ++++++++++++++++++
 CMS_SC/About.aspx.designer.cs | 18 ++++++++----------
 CMS_SC/sql/Update_3.2.sql     |  4 +++-
 Jenkinsfile                   |  2 +-
 4 files changed, 30 insertions(+), 12 deletions(-)

diff --git a/CMS_SC/About.aspx b/CMS_SC/About.aspx
index 3ca2871..1ce1ae4 100644
--- a/CMS_SC/About.aspx
+++ b/CMS_SC/About.aspx
@@ -1,7 +1,25 @@
 <%@ Page Title="" Language="C#" MasterPageFile="~/Bootstrap.Master" AutoEventWireup="true" CodeBehind="About.aspx.cs" Inherits="CMS_SC.About" %>
+
 <asp:Content ID="Content1" ContentPlaceHolderID="HeadContent" runat="server">
 </asp:Content>
 <asp:Content ID="Content2" ContentPlaceHolderID="FeaturedContent" runat="server">
 </asp:Content>
 <asp:Content ID="Content3" ContentPlaceHolderID="MainContent" runat="server">
+  <div class="container">
+    <div class="row card" style="margin: 2px 4px;">
+      <div class="card-header">
+        <div class="row" style="margin: 2px 4px;">
+          <h3 class="card-title text-uppercase">SteamWare's CMS-SC INFO</h3>
+        </div>
+      </div>
+      <div class="card-body">
+        Ricapitolare alcune info (come cart espandibili?) tra cui:
+        <ul>
+          <li>pareto chiamate x browser size</li>
+          <li>Vers dll (come mapo tablet)</li>
+          <li>dati globali (uptime globale, da refresh, num chiamate (a redis? a iis?)</li>
+        </ul>
+      </div>
+    </div>
+  </div>
 </asp:Content>
diff --git a/CMS_SC/About.aspx.designer.cs b/CMS_SC/About.aspx.designer.cs
index abbb224..d90f59e 100644
--- a/CMS_SC/About.aspx.designer.cs
+++ b/CMS_SC/About.aspx.designer.cs
@@ -1,17 +1,15 @@
 //------------------------------------------------------------------------------
-// <auto-generated>
+// <generato automaticamente>
 //     Codice generato da uno strumento.
 //
 //     Le modifiche a questo file possono causare un comportamento non corretto e verranno perse se
-//     il codice viene rigenerato.
-// </auto-generated>
+//     il codice viene rigenerato. 
+// </generato automaticamente>
 //------------------------------------------------------------------------------
 
-namespace CMS_SC
-{
-
-
-  public partial class About
-  {
-  }
+namespace CMS_SC {
+    
+    
+    public partial class About {
+    }
 }
diff --git a/CMS_SC/sql/Update_3.2.sql b/CMS_SC/sql/Update_3.2.sql
index 53d9dd9..590b4fa 100644
--- a/CMS_SC/sql/Update_3.2.sql
+++ b/CMS_SC/sql/Update_3.2.sql
@@ -9,5 +9,7 @@ VALUES ('Settings_UpdMan','SuperAdmin','S')
 INSERT INTO [dbo].[Permessi2Funzione] ([COD_PERMESSO],[COD_FUNZIONE],[READWRITE])
 VALUES ('Settings_About','SuperAdmin','S')
 
-
+-- vocabolario...
+exec voc.stp_insNewLemma 'UpdMan','Update Manager'
+exec voc.stp_insNewLemma 'About','About CMS-SC'
 
diff --git a/Jenkinsfile b/Jenkinsfile
index 63a350a..c64e3d4 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -14,7 +14,7 @@ pipeline {
 
 				/* calcolo numero versione... diverso x branch MASTER/DEVELOP */
 				script {
-					withEnv(['NEXT_BUILD_NUMBER=4227']) {
+					withEnv(['NEXT_BUILD_NUMBER=4229']) {
 						// env.versionNumber = VersionNumber(versionNumberString : '${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2006-01-01', skipFailedBuilds: true)
 						env.versionNumber = VersionNumber(versionNumberString : '${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2006-01-01', skipFailedBuilds: true, overrideBuildsAllTime: '${NEXT_BUILD_NUMBER}')
     					env.APP_NAME = 'CMS-SC'