Egalware/WebSCR
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix comportamento footer x 2 livelli...

Browse Source
This commit is contained in:
Samuele E. Locatelli
2015-09-18 09:51:02 +02:00
parent 527947a449
commit b1c4015ec8
18 changed files with 214 additions and 73 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.vs/WebSCR/v14/.suo
BIN
View File
Binary file not shown.
WebSCR/Content/jquery.mobile-1.4.5.min.css
Vendored
+10
View File
File diff suppressed because one or more lines are too long
WebSCR/Content/jquery.mobile.external-png-1.4.5.min.css
Vendored
+10
View File
File diff suppressed because one or more lines are too long
WebSCR/Content/jquery.mobile.inline-png-1.4.5.min.css
Vendored
+11 -1
View File
File diff suppressed because one or more lines are too long
WebSCR/Content/jquery.mobile.inline-svg-1.4.5.min.css
Vendored
+10
View File
File diff suppressed because one or more lines are too long
WebSCR/Content/jquery.mobile.structure-1.4.5.min.css
Vendored
+10
View File
File diff suppressed because one or more lines are too long
WebSCR/Content/jquery.mobile.theme-1.4.5.min.css
Vendored
+10
View File
File diff suppressed because one or more lines are too long
WebSCR/OrdiniPerData.aspx
+5
View File
@@ -0,0 +1,5 @@
<%@ Page Title="" Language="C#" MasterPageFile="~/JQMob.Master" AutoEventWireup="true" CodeBehind="OrdiniPerData.aspx.cs" Inherits="WebSCR.OrdiniPerData" %>
<asp:Content ID="Content1" ContentPlaceHolderID="head" runat="server">
</asp:Content>
<asp:Content ID="Content2" ContentPlaceHolderID="ContentPlaceHolder1" runat="server">
</asp:Content>
WebSCR/OrdiniPerData.aspx.cs
+17
View File
@@ -0,0 +1,17 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Web;
using System.Web.UI;
using System.Web.UI.WebControls;
namespace WebSCR
{
public partial class OrdiniPerData : System.Web.UI.Page
{
protected void Page_Load(object sender, EventArgs e)
{
}
}
}
WebSCR/OrdiniPerData.aspx.designer.cs
Generated
+17
View File
@@ -0,0 +1,17 @@
//------------------------------------------------------------------------------
// <auto-generated>
// This code was generated by a tool.
//
// Changes to this file may cause incorrect behavior and will be lost if
// the code is regenerated.
// </auto-generated>
//------------------------------------------------------------------------------
namespace WebSCR
{
public partial class OrdiniPerData
{
}
}
WebSCR/WebSCR.csproj
+33 -8
View File
@@ -106,7 +106,9 @@
<Content Include="App_Readme\Elmah.txt" />
<Content Include="Clienti.aspx" />
<Content Include="Content\font-awesome.css" />
<Content Include="Content\font-awesome.min.css" />
<Content Include="Content\font-awesome.min.css">
<DependentUpon>font-awesome.css</DependentUpon>
</Content>
<Content Include="Content\images\ajax-loader.gif" />
<Content Include="Content\images\icons-png\action-black.png" />
<Content Include="Content\images\icons-png\action-white.png" />
@@ -309,19 +311,33 @@
<Content Include="Content\images\icons-svg\video-black.svg" />
<Content Include="Content\images\icons-svg\video-white.svg" />
<Content Include="Content\jquery.mobile-1.4.5.css" />
<Content Include="Content\jquery.mobile-1.4.5.min.css" />
<Content Include="Content\jquery.mobile-1.4.5.min.css">
<DependentUpon>jquery.mobile-1.4.5.css</DependentUpon>
</Content>
<Content Include="Content\jquery.mobile.external-png-1.4.5.css" />
<Content Include="Content\jquery.mobile.external-png-1.4.5.min.css" />
<Content Include="Content\jquery.mobile.external-png-1.4.5.min.css">
<DependentUpon>jquery.mobile.external-png-1.4.5.css</DependentUpon>
</Content>
<Content Include="Content\jquery.mobile.icons-1.4.5.css" />
<Content Include="Content\jquery.mobile.icons-1.4.5.min.css" />
<Content Include="Content\jquery.mobile.icons-1.4.5.min.css">
<DependentUpon>jquery.mobile.icons-1.4.5.css</DependentUpon>
</Content>
<Content Include="Content\jquery.mobile.inline-png-1.4.5.css" />
<Content Include="Content\jquery.mobile.inline-png-1.4.5.min.css" />
<Content Include="Content\jquery.mobile.inline-png-1.4.5.min.css">
<DependentUpon>jquery.mobile.inline-png-1.4.5.css</DependentUpon>
</Content>
<Content Include="Content\jquery.mobile.inline-svg-1.4.5.css" />
<Content Include="Content\jquery.mobile.inline-svg-1.4.5.min.css" />
<Content Include="Content\jquery.mobile.inline-svg-1.4.5.min.css">
<DependentUpon>jquery.mobile.inline-svg-1.4.5.css</DependentUpon>
</Content>
<Content Include="Content\jquery.mobile.structure-1.4.5.css" />
<Content Include="Content\jquery.mobile.structure-1.4.5.min.css" />
<Content Include="Content\jquery.mobile.structure-1.4.5.min.css">
<DependentUpon>jquery.mobile.structure-1.4.5.css</DependentUpon>
</Content>
<Content Include="Content\jquery.mobile.theme-1.4.5.css" />
<Content Include="Content\jquery.mobile.theme-1.4.5.min.css" />
<Content Include="Content\jquery.mobile.theme-1.4.5.min.css">
<DependentUpon>jquery.mobile.theme-1.4.5.css</DependentUpon>
</Content>
<Content Include="Content\Style.css">
<DependentUpon>Style.less</DependentUpon>
</Content>
@@ -340,6 +356,7 @@
<Content Include="images\LogoSteamware.png" />
<Content Include="Interventi.aspx" />
<Content Include="Menu.aspx" />
<Content Include="OrdiniPerData.aspx" />
<Content Include="Pianificazione.aspx" />
<Content Include="fonts\fontawesome-webfont.svg" />
<Content Include="Global.asax" />
@@ -356,6 +373,7 @@
<Content Include="NLog.config">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</Content>
<None Include="bundleconfig.json" />
<None Include="compilerconfig.json" />
<None Include="NLog.xsd">
<SubType>Designer</SubType>
@@ -450,6 +468,13 @@
<Compile Include="Menu.aspx.designer.cs">
<DependentUpon>Menu.aspx</DependentUpon>
</Compile>
<Compile Include="OrdiniPerData.aspx.cs">
<DependentUpon>OrdiniPerData.aspx</DependentUpon>
<SubType>ASPXCodeBehind</SubType>
</Compile>
<Compile Include="OrdiniPerData.aspx.designer.cs">
<DependentUpon>OrdiniPerData.aspx</DependentUpon>
</Compile>
<Compile Include="Pianificazione.aspx.cs">
<DependentUpon>Pianificazione.aspx</DependentUpon>
<SubType>ASPXCodeBehind</SubType>
WebSCR/WebUserControls/mod_footer.ascx
+4 -14
View File
@@ -1,18 +1,8 @@
<%@ Control Language="C#" AutoEventWireup="true" CodeBehind="mod_footer.ascx.cs" Inherits="WebSCR.WebUserControls.mod_footer" %>
<div id="divFooterMenu" runat="server" data-role="navbar">
<div id="divFooterMenu" runat="server" data-role="navbar" data-iconpos="top">
<ul runat="server" id="ulStd">
<%--<li><a href="Clienti" data-icon="user" class='<%: liClass("Clienti") %>'>Clienti</a></li>
<li><a href="Interventi" data-icon="mail" class='<%: liClass("Interventi") %>'>Gestione Interventi</a></li>
<li><a href="Pianificazione" data-icon="calendar" class='<%: liClass("Pianificazione") %>'>Pianificazione</a></li>
<li><a href="Squadra" data-icon="navigation" class='<%: liClass("Squadre") %>'>Squadre/Consegne</a></li>
<li><a href="Setup" data-icon="gear" class='<%: liClass("Setup") %>'>Setup</a></li>--%>
<li><a href="Magazzino" data-icon="mail" class='<%: liClass("Magazzino") %>'>Magazzino</a></li>
<li><a href="Pianificazione" data-icon="calendar" class='<%: liClass("Pianificazione") %>'>Uffici</a></li>
<li><a href="Squadra" data-icon="navigation" class='<%: liClass("Squadre") %>'>Squadre Consegne</a></li>
</ul>
<ul runat="server" id="ulSquadra" visible="false">
<li><a href="Menu" data-icon="home" class='<%: liClass("Menu") %>'>Menu Squadre</a></li>
<li><a href="Squadra" data-icon="navigation" class='<%: liClass("Squadre") %>'>Squadre/Consegne</a></li>
<li><a href="Magazzino" data-icon="grid" class='<%: liClass("OrdiniPerData") %>'>Magazzino</a></li>
<li><a href="Pianificazione" data-icon="calendar" class='<%: liClass("Clienti#Interventi#Pianificazione#Setup") %>'>Uffici</a></li>
<li><a href="Squadra" data-icon="location" class='<%: liClass("Menu#Squadra") %>'>Squadre Consegne</a></li>
</ul>
</div>
WebSCR/WebUserControls/mod_footer.ascx.cs
+4 -22
View File
@@ -16,14 +16,6 @@ namespace WebSCR.WebUserControls
{
divFooterMenu.Visible = false;
}
bool showMenuSquadra = false;
// in base alla pagina corrente decido cosa mostrare in footer...
if (devicesAuthProxy.pagCorrente == "Squadra")
{
showMenuSquadra = true;
}
ulStd.Visible = !showMenuSquadra;
ulSquadra.Visible = showMenuSquadra;
}
/// <summary>
/// restituisce stato active se pagina corrente...
@@ -33,20 +25,10 @@ namespace WebSCR.WebUserControls
public string liClass(object nomeElem)
{
string answ = "";
string nome = nomeElem.ToString();
if (Request.Url.ToString().ToLower().Contains(nome.ToLower())) answ = "ui-btn-active";
// !!!FARE!!! controllo visibilità da permessi (x squadre in particolare)
#if false
// se E' Dettaglio e non c'è cod Impegno metto disabled...
if (nome.Contains("Dettaglio"))
{
if (!memLayer.ML.isInSessionObject("Impegno"))
{
answ += " ui-state-disabled";
}
}
#endif
string nome = nomeElem.ToString().ToLower();
string pageUrl = devicesAuthProxy.getPage(Request.Url).ToString().ToLower();
//if (Request.Url.ToString().ToLower().Contains(nome.ToLower())) answ = "ui-btn-active";
if (nome.Contains(pageUrl)) answ = "ui-btn-active";
return answ;
}
WebSCR/WebUserControls/mod_footer.ascx.designer.cs
Generated
-9
View File
@@ -29,14 +29,5 @@ namespace WebSCR.WebUserControls {
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlGenericControl ulStd;
/// <summary>
/// ulSquadra 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.HtmlGenericControl ulSquadra;
}
}
WebSCR/WebUserControls/mod_header.ascx
+19 -19
View File
@@ -12,8 +12,25 @@
<a href="UserAdmin" data-icon="lock" class="ui-btn ui-shadow ui-corner-all ui-icon-lock ui-btn-icon-right ui-btn-inline">&nbsp;</a>
</div>
</div>
<div id="headData" style="clear: both;">
<div class="ui-body-b">
<div id="divHeaderMenu" runat="server" data-role="navbar" data-iconpos="right">
<ul runat="server" id="ulStd" data-iconpos="right">
<li><a href="Clienti" data-icon="user" class='<%: liClass("Clienti") %>'>Clienti</a></li>
<li><a href="Interventi" data-icon="mail" class='<%: liClass("Interventi") %>'>Gestione Interventi</a></li>
<li><a href="Pianificazione" data-icon="calendar" class='<%: liClass("Pianificazione") %>'>Pianificazione</a></li>
<li><a href="Setup" data-icon="gear" class='<%: liClass("Setup") %>'>Setup</a></li>
</ul>
<ul runat="server" id="ulSquadra" visible="false">
<li><a href="Menu" data-icon="home" class='<%: liClass("Menu") %>'>Menu Squadre</a></li>
<li><a href="Squadra" data-icon="navigation" class='<%: liClass("Squadra") %>'>Squadre/Consegne</a></li>
</ul>
<ul runat="server" id="ulMagazzino" visible="false">
<li><a href="Menu" data-icon="home" class='<%: liClass("Menu") %>'>Menu Squadre</a></li>
<li><a href="Magazzino" data-icon="navigation" class='<%: liClass("Cronologico") %>'>Cronologico Ordini</a></li>
</ul>
</div>
</div>
<div id="headData" style="clear: both; padding: 4px;">
<div style="float: right; font-size: 0.7em; font-weight: 100; margin-right: 4px;">
<%: CognomeNome %>
</div>
@@ -24,20 +41,3 @@
<%: DataSel %> | <%: ClienteSel %> | <%: SquadraSel %>
</div>--%>
</div>
<div id="divHeaderMenu" runat="server" data-role="navbar">
<ul runat="server" id="ulStd" data-iconpos="right">
<li><a href="Clienti" data-icon="user" class='<%: liClass("Clienti") %>'>Clienti</a></li>
<li><a href="Interventi" data-icon="mail" class='<%: liClass("Interventi") %>'>Gestione Interventi</a></li>
<li><a href="Pianificazione" data-icon="calendar" class='<%: liClass("Pianificazione") %>'>Pianificazione</a></li>
<li><a href="Setup" data-icon="gear" class='<%: liClass("Setup") %>'>Setup</a></li>
</ul>
<ul runat="server" id="ulSquadra" visible="false">
<li><a href="Menu" data-icon="home" class='<%: liClass("Menu") %>'>Menu Squadre</a></li>
<li><a href="Squadra" data-icon="navigation" class='<%: liClass("Squadre") %>'>Squadre/Consegne</a></li>
</ul>
<ul runat="server" id="ulMagazzino" visible="false">
<li><a href="Menu" data-icon="home" class='<%: liClass("Menu") %>'>Menu Squadre</a></li>
<li><a href="Magazzino" data-icon="navigation" class='<%: liClass("Cronologico") %>'>Cronologico Ordini</a></li>
</ul>
</div>
WebSCR/WebUserControls/mod_header.ascx.cs
+4
View File
@@ -79,6 +79,10 @@ namespace WebSCR.WebUserControls
/// <param name="e"></param>
protected void Page_Load(object sender, EventArgs e)
{
if (!memLayer.ML.isInSessionObject("USER_NAME"))
{
divHeaderMenu.Visible = false;
}
// altri controlli
if (!Page.IsPostBack)
{
WebSCR/bin/WebSCR.dll
BIN
View File
Binary file not shown.
WebSCR/bundleconfig.json
+50
View File
@@ -0,0 +1,50 @@
[
{
"outputFileName": "Content/jquery.mobile.theme-1.4.5.css",
"inputFiles": [
"Content/jquery.mobile.theme-1.4.5.css"
]
},
{
"outputFileName": "Content/jquery.mobile.structure-1.4.5.css",
"inputFiles": [
"Content/jquery.mobile.structure-1.4.5.css"
]
},
{
"outputFileName": "Content/jquery.mobile.inline-svg-1.4.5.css",
"inputFiles": [
"Content/jquery.mobile.inline-svg-1.4.5.css"
]
},
{
"outputFileName": "Content/jquery.mobile.inline-png-1.4.5.css",
"inputFiles": [
"Content/jquery.mobile.inline-png-1.4.5.css"
]
},
{
"outputFileName": "Content/jquery.mobile.icons-1.4.5.css",
"inputFiles": [
"Content/jquery.mobile.icons-1.4.5.css"
]
},
{
"outputFileName": "Content/jquery.mobile.external-png-1.4.5.css",
"inputFiles": [
"Content/jquery.mobile.external-png-1.4.5.css"
]
},
{
"outputFileName": "Content/jquery.mobile-1.4.5.css",
"inputFiles": [
"Content/jquery.mobile-1.4.5.css"
]
},
{
"outputFileName": "Content/font-awesome.css",
"inputFiles": [
"Content/font-awesome.css"
]
}
]