Author: thuy.nguyen Date: 2009-11-27 05:46:54 -0500 (Fri, 27 Nov 2009) New Revision: 835 Modified: portal/trunk/web/portal/src/main/webapp/groovy/portal/webui/page/UIWizardPageSetInfo.gtmpl portal/trunk/web/portal/src/main/webapp/groovy/webui/core/UIWizard.gtmpl Log: GTNPORTAL-290: NPE when delete tab of new page in Dashboard page Modified: portal/trunk/web/portal/src/main/webapp/groovy/portal/webui/page/UIWizardPageSetInfo.gtmpl =================================================================== --- portal/trunk/web/portal/src/main/webapp/groovy/portal/webui/page/UIWizardPageSetInfo.gtmpl 2009-11-27 10:36:14 UTC (rev 834) +++ portal/trunk/web/portal/src/main/webapp/groovy/portal/webui/page/UIWizardPageSetInfo.gtmpl 2009-11-27 10:46:54 UTC (rev 835) @@ -11,7 +11,7 @@ %> <div class="UIWizardPageSetInfo"> <%uiform.begin()%> - <div class="OverflowContainer <%=isNoSelecter ? "NoPageSelecter" : ""%>"> + <div class="<%=isNoSelecter ? "NoPageSelecter" : ""%>"> <%if(!isNoSelecter) {%> <div class="PageNodeContainer"> <% uicomponent.renderChild(UIPageNodeSelector.class); %> Modified: portal/trunk/web/portal/src/main/webapp/groovy/webui/core/UIWizard.gtmpl =================================================================== --- portal/trunk/web/portal/src/main/webapp/groovy/webui/core/UIWizard.gtmpl 2009-11-27 10:36:14 UTC (rev 834) +++ portal/trunk/web/portal/src/main/webapp/groovy/webui/core/UIWizard.gtmpl 2009-11-27 10:46:54 UTC (rev 835) @@ -4,15 +4,20 @@ <div class="UIWizardContent"> <%/*WizardStepTitle*/%> + <div class="WizardStepTitleBar"> - <div class="OverflowContainer"> - <div class="WizardIcon"><span></span></div> - <div class="WizardTitle"> - <%=_ctx.appRes(uicomponent.getId() + ".label.pageCreateWizard")%>: + <div class="WizardStepTitleBarR"> + <div class="WizardStepTitleBarM"> + <div class="OverflowContainer"> + <div class="WizardIcon"><span></span></div> + <div class="WizardTitle"> + <%=_ctx.appRes(uicomponent.getId() + ".label.pageCreateWizard")%>: + </div> + <div class="StepTitle"> + <%=_ctx.appRes(uicomponent.getId() + ".label.step"+String.valueOf(step)+".title")%> + </div> + </div> </div> - <div class="StepTitle"> - <%=_ctx.appRes(uicomponent.getId() + ".label.step"+String.valueOf(step)+".title")%> - </div> </div> </div> @@ -20,100 +25,104 @@ <div class="WizardStepContent"><% uicomponent.renderChildren(); %></div> <div class="WizardControlBar"> - <div class="OverflowContainer"> - <div class="StepNavigationBar"> - <div class="StepNavigationTitle"> - <%=_ctx.appRes(uicomponent.getId() + ".label.wizardSteps")%>: - </div> - <% - List children = uicomponent.getChildren(); - int numberSteps = uicomponent.getNumberSteps(); - String actionLink = "#"; - int i = 1; - while(i <= numberSteps) { - int j = i; - if(uicomponent.isShowWelcomeComponent()) j--; - if(j < 1){ - i++; - continue; - } - strStep = _ctx.appRes(uicomponent.getId() + ".label.step") + String.valueOf(j); - if(i != step) { - actionLink = uicomponent.url("ViewStep" + String.valueOf(i)); - print "<a href=\"$actionLink\" title=\"$strStep\">"; - } else print "<a href=\"#\" class=\"SelectedStep\" title=\"$strStep\">"; - - print String.valueOf(j); - println "</a>"; - i++; - } - %> - </div> - - <%/*Begin UIWizardActionBar*/%> - <div class="ActionBar"> - - <div class="UIAction"> - <table class="ActionContainer"> - <tr> - <td> - <% if (uicomponent.isShowActions()) { %> - <div onclick="<%=uicomponent.event("Abort", "");%>" class="ActionButton LightBlueStyle"> - <div class="ButtonLeft"> - <div class="ButtonRight"> - <div class="ButtonMiddle"> - <a href="javascript:void(0);"><%=_ctx.appRes(uicomponent.getId() + ".label.abort")%></a> + <div class="WizardControlBarR"> + <div class="WizardControlBarM"> + <div class="OverflowContainer"> + <div class="StepNavigationBar"> + <div class="StepNavigationTitle"> + <%=_ctx.appRes(uicomponent.getId() + ".label.wizardSteps")%>: + </div> + <% + List children = uicomponent.getChildren(); + int numberSteps = uicomponent.getNumberSteps(); + String actionLink = "#"; + int i = 1; + while(i <= numberSteps) { + int j = i; + if(uicomponent.isShowWelcomeComponent()) j--; + if(j < 1){ + i++; + continue; + } + strStep = _ctx.appRes(uicomponent.getId() + ".label.step") + String.valueOf(j); + if(i != step) { + actionLink = uicomponent.url("ViewStep" + String.valueOf(i));0 + print "<a href=\"$actionLink\" title=\"$strStep\">"; + } else print "<a href=\"#\" class=\"SelectedStep\" title=\"$strStep\">"; + + print String.valueOf(j); + println "</a>"; + i++; + } + %> + </div> + + <%/*Begin UIWizardActionBar*/%> + <div class="ActionBar"> + + <div class="UIAction"> + <table class="ActionContainer"> + <tr> + <td> + <% if (uicomponent.isShowActions()) { %> + <div onclick="<%=uicomponent.event("Abort", "");%>" class="ActionButton LightBlueStyle"> + <div class="ButtonLeft"> + <div class="ButtonRight"> + <div class="ButtonMiddle"> + <a href="javascript:void(0);"><%=_ctx.appRes(uicomponent.getId() + ".label.abort")%></a> + </div> + </div> </div> </div> - </div> - </div> - <% - String action = "next"; - if(step == children.size()){ - action = "done"; - actionLink = uicomponent.event("ViewStep" + String.valueOf(step+1), ""); - } else { - actionLink = uicomponent.url("ViewStep" + String.valueOf(step+1)); - } - %> - - <div onclick="$actionLink" class="ActionButton LightBlueStyle"> - <div class="ButtonLeft"> - <div class="ButtonRight"> - <div class="ButtonMiddle"> - <%=_ctx.appRes(uicomponent.getId() + ".label."+action)%> + <% + String action = "next"; + if(step == children.size()){ + action = "done"; + actionLink = uicomponent.event("ViewStep" + String.valueOf(step+1), ""); + } else { + actionLink = uicomponent.url("ViewStep" + String.valueOf(step+1)); + } + %> + + <div onclick="$actionLink" class="ActionButton LightBlueStyle"> + <div class="ButtonLeft"> + <div class="ButtonRight"> + <div class="ButtonMiddle"> + <%=_ctx.appRes(uicomponent.getId() + ".label."+action)%> + </div> + </div> </div> </div> - </div> - </div> - - <% - int showBack = step; - if (uicomponent.getClass().getName().contains("Edit")) showBack++; - if(showBack > 2) { - actionLink = uicomponent.url("ViewStep" + String.valueOf(step-1)); - String display = "LightBlueStyle"; - %> - <div onclick="$actionLink" class="ActionButton $display"> - <div class="ButtonLeft"> - <div class="ButtonRight"> - <div class="ButtonMiddle"> - <%=_ctx.appRes(uicomponent.getId() + ".label.back")%> + + <% + int showBack = step; + if (uicomponent.getClass().getName().contains("Edit")) showBack++; + if(showBack > 2) { + actionLink = uicomponent.url("ViewStep" + String.valueOf(step-1)); + String display = "LightBlueStyle"; + %> + <div onclick="$actionLink" class="ActionButton $display"> + <div class="ButtonLeft"> + <div class="ButtonRight"> + <div class="ButtonMiddle"> + <%=_ctx.appRes(uicomponent.getId() + ".label.back")%> + </div> + </div> </div> </div> - </div> - </div> - <% } %> - - - <%} // End if (step != 3)%> - </td> - </tr> - </table> + <% } %> + + + <%} // End if (step != 3)%> + </td> + </tr> + </table> + </div> + + </div> + <%/*End UIWizardActionBar*/%> </div> - - </div> - <%/*End UIWizardActionBar*/%> + </div> </div> </div>