Completata prima release dei search provider

Inserito minifier x css/jscript

git-svn-id: https://keyhammer.ath.cx/svn/GMW/trunk@74 365432ac-a1b5-4ffd-bb28-6d3099d32164
This commit is contained in:
samuele
2010-05-28 14:41:25 +00:00
parent 22911fe4f1
commit 7a8ae867cd
10 changed files with 76 additions and 50 deletions
+10
View File
@@ -548,6 +548,16 @@
<Target Name="AfterBuild">
</Target>
-->
<Import Project="$(MSBuildExtensionsPath)\Microsoft\MicrosoftAjax\ajaxmin.tasks" />
<Target Name="AfterBuild">
<ItemGroup>
<JS Include="**\*.js" Exclude="**\*.min.js;Scripts\*.js" />
</ItemGroup>
<ItemGroup>
<CSS Include="**\*.css" Exclude="**\*.min.css" />
</ItemGroup>
<AjaxMin JsSourceFiles="@(JS)" JsSourceExtensionPattern="\.js$" JsTargetExtension=".min.js" CssSourceFiles="@(CSS)" CssSourceExtensionPattern="\.css$" CssTargetExtension=".min.css" />
</Target>
<ProjectExtensions>
<VisualStudio>
<FlavorProperties GUID="{349c5851-65df-11da-9384-00065b846f21}">
+28 -14
View File
@@ -1,5 +1,4 @@
/* @group Generale */
.fixedVal
{
background-color: #cdcdcd;
@@ -84,6 +83,21 @@
font-weight: bold;
}
/*group search provider*/
.SearchProviderTitleGreen
{
font-size: 16pt;
font-weight: bold;
text-align: left;
color: #006600;
}
.PnlSearchProviderGreen
{
background: #EFFFEF;
border: solid 2px #005500;
padding:2px 2px 2px 2px;
}
/* @group Calendario */
.calSel
@@ -990,24 +1004,24 @@ A:hover
.bodyMainNoLogo
{
vertical-align: top;
border-left: maroon 1px solid;
height: 100%;
width: 100%;
vertical-align: top;
border-left: maroon 1px solid;
height: 100%;
width: 100%;
}
.bodyMainLogoPiccolo
{
background-image: url(images/sfondoMedio.png);
background-position: 97% 210px;
vertical-align: top;
border-left: maroon 1px solid;
height: 100%;
width: 100%;
background-attachment: scroll;
background-repeat: no-repeat;
background-image: url(images/sfondoMedio.png);
background-position: 97% 210px;
vertical-align: top;
border-left: maroon 1px solid;
height: 100%;
width: 100%;
background-attachment: scroll;
background-repeat: no-repeat;
}
*/
* /
.logoUpSx
{
width: 200;
+19 -14
View File
@@ -1,16 +1,21 @@
<%@ Control Language="C#" AutoEventWireup="true" CodeBehind="mod_SearchProvUDC.ascx.cs"
Inherits="GMW.WebUserControls.mod_SearchProvUDC" %>
<%@ Register src="mod_searchUDC.ascx" tagname="mod_searchUDC" tagprefix="uc1" %>
<%@ Register src="mod_execUDC.ascx" tagname="mod_execUDC" tagprefix="uc2" %>
<%@ Register src="mod_detailUDC.ascx" tagname="mod_detailUDC" tagprefix="uc3" %>
<table>
<tr>
<td valign="top">
<uc1:mod_searchUDC ID="mod_searchUDC1" runat="server" />
<uc2:mod_execUDC ID="mod_execUDC1" runat="server" />
</td>
<td valign="top">
<uc3:mod_detailUDC ID="mod_detailUDC1" runat="server" />
</td>
</tr>
</table>
<%@ Register Src="mod_searchUDC.ascx" TagName="mod_searchUDC" TagPrefix="uc1" %>
<%@ Register Src="mod_execUDC.ascx" TagName="mod_execUDC" TagPrefix="uc2" %>
<%@ Register Src="mod_detailUDC.ascx" TagName="mod_detailUDC" TagPrefix="uc3" %>
<asp:Panel runat="server" ID="pnlSearchProvider" CssClass="PnlSearchProviderGreen">
<div class="SearchProviderTitleGreen">
<asp:Label runat="server" ID="lblSearchProvider" txt="---" />
</div>
<table cellspacing="4">
<tr>
<td valign="top">
<uc1:mod_searchUDC ID="mod_searchUDC1" runat="server" />
<uc2:mod_execUDC ID="mod_execUDC1" runat="server" />
</td>
<td valign="top">
<uc3:mod_detailUDC ID="mod_detailUDC1" runat="server" />
</td>
</tr>
</table>
</asp:Panel>
@@ -38,10 +38,7 @@ namespace GMW.WebUserControls
private void doTraduci()
{
//chkLikeType.Text = traduci("AbilitaRicercaLike");
//chkLikeType.ToolTip = traduci("AbilitaRicercaLikeExpl");
//btnSearch.Text = traduci("btnSearch");
//TBWE_search.WatermarkText = traduci("insertCod4search");
lblSearchProvider.Text = traduci("UDC");
}
/// <summary>
@@ -13,6 +13,24 @@ namespace GMW.WebUserControls {
public partial class mod_SearchProvUDC {
/// <summary>
/// pnlSearchProvider 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.Panel pnlSearchProvider;
/// <summary>
/// lblSearchProvider 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.Label lblSearchProvider;
/// <summary>
/// mod_searchUDC1 control.
/// </summary>
@@ -45,9 +45,6 @@
<tr>
<td valign="top">
<asp:Panel runat="server" ID="pnlResults">
<b>
<asp:Label runat="server" ID="lblTipoSearch" />
</b>
<div>
<uc1:mod_SearchProvUDC ID="mod_SearchProvUDC1" runat="server" />
</div>
@@ -47,7 +47,6 @@ namespace GMW.WebUserControls
if (chkLikeType.Checked)
{
// è generica, mostro tutto!
lblTipoSearch.Text = traduci("RicercaGenerica");
mod_SearchProvUDC1.Visible = true;
mod_SearchProvUDC1.doSearch();
}
@@ -61,24 +60,19 @@ namespace GMW.WebUserControls
switch (testoCercato.Substring(0, 1))
{
case "I":
lblTipoSearch.Text = traduci("RicercaImballi");
mod_SearchProvUDC1.Visible = false;
break;
case "M":
lblTipoSearch.Text = traduci("RicercaMagazzino");
mod_SearchProvUDC1.Visible = false;
break;
case "O":
lblTipoSearch.Text = traduci("RicercaOperatore");
mod_SearchProvUDC1.Visible = false;
break;
case "U":
lblTipoSearch.Text = traduci("RicercaUDC");
mod_SearchProvUDC1.Visible = true;
mod_SearchProvUDC1.doSearch();
break;
default:
lblTipoSearch.Text = traduci("RicercaGenerica");
mod_SearchProvUDC1.Visible = false;
break;
}
-9
View File
@@ -67,15 +67,6 @@ namespace GMW.WebUserControls {
/// </remarks>
protected global::System.Web.UI.WebControls.Panel pnlResults;
/// <summary>
/// lblTipoSearch 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.Label lblTipoSearch;
/// <summary>
/// mod_SearchProvUDC1 control.
/// </summary>
Binary file not shown.
Binary file not shown.