fix menù SX alto

This commit is contained in:
Samuele Locatelli
2013-05-16 13:39:20 +02:00
parent 43d3859d22
commit 1ba4ec7cd1
16 changed files with 51 additions and 16 deletions
Binary file not shown.
+2 -2
View File
@@ -183,8 +183,8 @@ ul#menu {
ul#menu li {
display: inline;
list-style: none;
padding-left: 15px;
padding-right: 15px;
padding-left: 10px;
/*padding-right: 10px;*/
border-left: 1px solid #DEDEDE;
}
Binary file not shown.

After

Width:  |  Height:  |  Size: 2.0 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.5 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.3 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.7 KiB

+4
View File
@@ -197,6 +197,7 @@
<Content Include="Images\arrowRight_l.png" />
<Content Include="Images\arrowRight_m.png" />
<Content Include="Images\Bazaar.png" />
<Content Include="Images\bazaar_white.png" />
<Content Include="Images\bg-menu-main.png" />
<Content Include="Images\bullet.png" />
<Content Include="Images\cancel_l.png" />
@@ -252,6 +253,7 @@
<Content Include="Images\time_l.png" />
<Content Include="Images\time_m.png" />
<Content Include="Images\time_s.png" />
<Content Include="Images\tools_white.png" />
<Content Include="Images\view_l.png" />
<Content Include="Images\view_m.png" />
<Content Include="Images\view_s.png" />
@@ -275,6 +277,7 @@
<Content Include="Scripts\WebForms\MSAjax\MicrosoftAjaxWebServices.js" />
<Content Include="Services\WS_Data.asmx" />
<Content Include="SpostaCommesse.aspx" />
<Content Include="Images\help_white.png" />
<Content Include="WebUserControls\mod_autocomplete.ascx" />
<Content Include="WebUserControls\mod_commessa.ascx" />
<Content Include="WebUserControls\mod_commesse.ascx" />
@@ -289,6 +292,7 @@
<Content Include="WebUserControls\mod_spostaComm.ascx" />
<Content Include="WebUserControls\mod_testata.ascx" />
<Content Include="Content\Style.less" />
<Content Include="Images\progetto_white.png" />
<None Include="Scripts\jquery-2.0.0.intellisense.js" />
<Content Include="Scripts\jquery-2.0.0.js" />
<Content Include="Scripts\jquery-2.0.0.min.js" />
@@ -149,9 +149,7 @@
CommandArgument='<%# Eval("idxFase") %>' OnClick="btnNew_Click" ToolTip="Aggiungi Fase a commessa" Visible='<%# isAncestor(Eval("idxFaseAncest")) %>' />
&nbsp;
<asp:ImageButton ID="imgDelete" runat="server" CausesValidation="False" CommandArgument='<%# Eval("idxFase") %>' CommandName="Delete"
ImageUrl="../images/elimina_m.png" ToolTip="Delete" Visible='<%# delEnabled(Eval("idxFase")) %>' />
<%--<asp:ConfirmButtonExtender ID="ConfirmButtonExtender1" runat="server" ConfirmText='<%# traduci("confermaDel")%>' TargetControlID="imgDelete">
</asp:ConfirmButtonExtender>--%>
ImageUrl="../images/elimina_m.png" ToolTip="Delete" Visible='<%# delEnabled(Eval("idxFase")) %>' OnClientClick="return confirm('Confermi eliminazione record?')"/>
</div>
</ItemTemplate>
<EditItemTemplate>
@@ -168,9 +168,7 @@
<asp:TemplateField ItemStyle-HorizontalAlign="Center" ItemStyle-Wrap="false">
<ItemTemplate>
<asp:ImageButton ID="imgDelete" runat="server" CausesValidation="False" CommandArgument='<%# Eval("idxProgetto") %>' CommandName="Delete"
ImageUrl="../images/elimina_s.png" ToolTip="Delete" Visible='<%# delEnabled(Eval("idxProgetto")) %>' />
<%-- <asp:ConfirmButtonExtender ID="ConfirmButtonExtender1" runat="server" ConfirmText='<%# traduci("confermaDel")%>' TargetControlID="imgDelete">
</asp:ConfirmButtonExtender>--%>
ImageUrl="../images/elimina_s.png" ToolTip="Delete" Visible='<%# delEnabled(Eval("idxProgetto")) %>' OnClientClick="return confirm('Confermi eliminazione record?')" />
</ItemTemplate>
<EditItemTemplate>
<asp:ImageButton ID="imgUpdate2" runat="server" CausesValidation="False" CommandName="Update" ImageUrl="../images/apply_s.png"
@@ -4,25 +4,24 @@
<webopt:BundleReference ID="BundleReference1" runat="server" Path="~/Content/css" />
<% } %>
<div class="areaTitolo">
<div class="float-left fontPiccolo" style="padding: 8px 0px 8px 4px;">
<div class="float-left fontPiccolo" style="padding: 6px 0px 6px 4px;">
<asp:Label runat="server" ID="lblUser" />
<br />
<asp:Label runat="server" ID="lblPostazione" />
</div>
<div class="float-right" style="padding: 8px 6px 8px 6px;">
<div class="float-right" style="padding: 2px 10px 2px 0px;">
<nav>
<ul id="menu">
<li><a href="Menu"><asp:Image runat="server" ID="Image1" ImageUrl="~/images/home.png" Width="16px" Height="16px" AlternateText="Home" /></a></li>
<li><a href="Progetti">Progetti</a></li>
<li><a href="Bazaar">Bazaar</a></li>
<li><a href="Admin">Admin</a></li>
<li><a href="Help">?</a></li>
<li><a href="Menu" title="Home"><asp:Image runat="server" ID="Image1" ImageUrl="~/images/home.png" Width="28px" Height="28px" AlternateText="Home" /></a></li>
<li><a href="Progetti" title="Progetti"><asp:Image runat="server" ID="Image2" ImageUrl="~/images/progetto_white.png" Width="28px" Height="28px" AlternateText="Progetti" /></a></li>
<li><a href="Bazaar" title="Bazaar"><asp:Image runat="server" ID="Image3" ImageUrl="~/images/bazaar_white.png" Width="28px" Height="28px" AlternateText="Bazaar" /></a></li>
<li><a href="Admin"title="Admin"><asp:Image runat="server" ID="Image4" ImageUrl="~/images/tools_white.png" Width="28px" Height="28px" AlternateText="Progetti" /></a></li>
<li><a href="Help" title="Help"><asp:Image runat="server" ID="Image5" ImageUrl="~/images/help_white.png" Width="28px" Height="28px" AlternateText="Progetti" /></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>
<asp:LinkButton ID="btnUpdate" runat="server" OnClick="btnUpdate_Click" Text="PROJ-ETS" ToolTip="Update" />
</b>
@@ -48,6 +48,42 @@ namespace PROJ_ETS.WebUserControls {
/// </remarks>
protected global::System.Web.UI.WebControls.Image Image1;
/// <summary>
/// Image2 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 Image2;
/// <summary>
/// Image3 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 Image3;
/// <summary>
/// Image4 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 Image4;
/// <summary>
/// Image5 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 Image5;
/// <summary>
/// btnUpdate control.
/// </summary>
Binary file not shown.
Binary file not shown.
Binary file not shown.