fix menù testata x link diretti + fix vocabolario

XPS/Bootstrap.Master

@@ -45,11 +45,11 @@
                 <%--Site Scripts--%>
             </Scripts>
         </asp:ScriptManager>
-            <div class="navbar navbar-inverse navbar-fixed-top" role="navigation">
-                <div class="container-fluid">
-                    <uc1:mod_testata runat="server" ID="mod_testata" />
-                </div>
+        <div class="navbar navbar-inverse navbar-fixed-top" role="navigation">
+            <div class="container-fluid">
+                <uc1:mod_testata runat="server" ID="mod_testata" />
             </div>
+        </div>
         <div class="headSpacer"></div>
         <asp:UpdatePanel ID="uppFeatured" runat="server">
             <ContentTemplate>
@@ -94,6 +94,8 @@
                 </footer>
             </ContentTemplate>
         </asp:UpdatePanel>
+        <div class="col-xs-12" style="min-height: 3em;">
+        </div>
     </form>
     <script src="Scripts/bootstrap.min.js"></script>
     <asp:PlaceHolder ID="PlaceHolder2" runat="server">

XPS/Content/Style.css

@@ -234,12 +234,13 @@
 }
 .navbar-inverse .navbar-nav > .active > a {
   background: transparent;
-  color: #FFF;
+  color: #F90;
+  border: 1px solid #F90;
   /*margin: -5px;*/
 }
 .navbar-inverse .navbar-nav > .active > a:hover {
   background: transparent;
-  color: #F90;
+  color: #FFF;
   /*margin: -5px;*/
 }
 .navbar-right {

XPS/Content/Style.less

@@ -90,6 +90,7 @@
         color: dodgerblue;
     }
 }
+
 .warnRed {
     color: red;
 }
@@ -290,13 +291,14 @@
 
 .navbar-inverse .navbar-nav > .active > a {
     background: transparent;
-    color: #FFF;
+    color: #F90;
+    border: 1px solid #F90;
     /*margin: -5px;*/
 }
 
     .navbar-inverse .navbar-nav > .active > a:hover {
         background: transparent;
-        color: #F90;
+        color: #FFF;
         /*margin: -5px;*/
     }
 

XPS/Web.config

@@ -83,6 +83,7 @@
         <!--<add key="currSite" value="http://IIS02/XPS/"/>-->
         <add key="currSite" value="http://localhost:10840/" />
         <!--gestione pagina-->
+        <add key="menuCondensed" value="false" />
         <add key="intUpdatePagina_ms" value="120000" />
         <add key="_righeDataGrid" value="30" />
         <add key="_righeDataGridAnagr" value="20" />

XPS/WebUserControls/mod_scadenziarioCommesse.ascx

@@ -51,8 +51,7 @@
                 <asp:ObjectDataSource ID="odsDate" runat="server" OldValuesParameterFormatString="original_{0}"
                     SelectMethod="getByDataMin" TypeName="XPS_data.DS_utilityTableAdapters.v_dateEsecuzioneTableAdapter">
                     <SelectParameters>
-                        <asp:ControlParameter ControlID="txtFromDate" Name="dataMin" PropertyName="Text"
-                            Type="DateTime" />
+                        <asp:ControlParameter ControlID="txtFromDate" Name="dataMin" PropertyName="Text" Type="DateTime" />
                     </SelectParameters>
                 </asp:ObjectDataSource>
             </ContentTemplate>

XPS/WebUserControls/mod_testata.ascx

@@ -12,11 +12,11 @@
             <li class='navbarSep'>
                 <asp:HyperLink runat="server" ID="hlHome" NavigateUrl="~/" CssClass="navbar-brand" ToolTip='<%# SteamWare.memLayer.ML.confReadString("titleApp") %>'> <i class="fa fa-home fa-lg"></i></asp:HyperLink>
             </li>
-            <li class="active">
+            <%--<li class="active">
                 <asp:LinkButton runat="server" ID="lbnUpdate" Text="---" OnClick="lbnUpdate_Click" ToolTip="Update">
                     <%: nomePag %>
                     <i class="fa-lg <%: cssIconPag %>"></i>
-                </asp:LinkButton></li>
+                </asp:LinkButton></li>--%>
             <li>
                 <asp:LinkButton runat="server" ID="lbnUpdate2">
                 </asp:LinkButton>
@@ -32,7 +32,8 @@
         <ul id="itemPlaceholderContainer" runat="server" class="nav navbar-nav navbar-right">
             <asp:Repeater ID="menu" runat="server" DataSourceID="XmlMenu">
                 <ItemTemplate>
-                    <li class="dropdown">
+                    <%--VERSIONE CONDENSED (commentata)--%>
+                    <%--<li class="dropdown">
                         <a href='<%# XPath("@url")%>' class="dropdown-toggle" data-toggle="dropdown">
                             <i class='<%# XPath("@description")%>'></i>
                             <%# XPath("@title")%>
@@ -50,7 +51,18 @@
                                 </ItemTemplate>
                             </asp:Repeater>
                         </ul>
-                    </li>
+                    </li>--%>
+                    <%--VERSIONE EXPLODED--%>
+                    <asp:Repeater ID="voci" runat="server" DataSource='<%# XPathSelect("voce") %>'>
+                        <ItemTemplate>
+                            <li class='<%# checkPag(XPath("@title")) %>'>
+                                <a href='<%# XPath("@url").ToString().Replace("~/","")%>'>
+                                    <i class='<%# XPath("@description")%>'></i>
+                                    <%# SteamWare.SteamwareStrings.limitString(XPath("@title").ToString(), 15)%>
+                                </a>
+                            </li>
+                        </ItemTemplate>
+                    </asp:Repeater>
                 </ItemTemplate>
                 <SeparatorTemplate>
                 </SeparatorTemplate>
@@ -70,4 +82,4 @@
             <asp:HyperLink runat="server" ID="hlLang" NavigateUrl="~/chLang"> <i class="fa fa-flag-checkered"></i> <%: string.Format("{0} - [{1}]", SteamWare.devicesAuthProxy.stObj.CognomeNome, SteamWare.devicesAuthProxy.stObj.lingua) %></asp:HyperLink>
         </div>
     </div>
-</div>
+</div>

XPS/WebUserControls/mod_testata.ascx.cs

@@ -259,5 +259,18 @@ namespace XPS.WebUserControls
         }
 
         public event EventHandler eh_nuovaRicerca;
+
+        public string checkPag(object currPag)
+        {
+            string answ = "";
+
+            try
+            {
+                if (nomePag == currPag.ToString()) answ = "active";
+            }
+            catch
+            { }
+            return answ;
+        }
     }
 }

XPS/WebUserControls/mod_testata.ascx.designer.cs

@@ -39,15 +39,6 @@ namespace XPS.WebUserControls {
         /// </remarks>
         protected global::System.Web.UI.WebControls.HyperLink hlHome;
         
-        /// <summary>
-        /// lbnUpdate 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.LinkButton lbnUpdate;
-        
         /// <summary>
         /// lbnUpdate2 control.
         /// </summary>

XPS/scadenziarioCommesse.aspx

@@ -13,8 +13,6 @@
             <div class="col-xs-12">
                 <uc1:mod_scadenziarioCommesse ID="mod_scadenziarioCommesse1" runat="server" />
             </div>
-            <div class="col-xs-12" style="min-height: 3em;">
-            </div>
         </div>
     </div>
 </asp:Content>

XPS_data/selData.cs

@@ -36,7 +36,8 @@ public class selData : selettori
     /// <param name="Original_Lemma"></param>
     public void updateLemmaVoc(string Traduzione, string Original_Lingua, string Original_Lemma)
     {
-        SteamWare.DataWrap.DW.taVocabolario.UpdateQuery(Traduzione, Original_Lingua, Original_Lemma);
+        //SteamWare.DataWrap.DW.taVocabolario.UpdateQuery(Traduzione, Original_Lingua, Original_Lemma);
+        DataWrap.DW.taVocabolario.upsertLemma(Original_Lingua, Original_Lemma, Traduzione);
     }
     /// <summary>
     /// cancella il lemma indicato