[jboss-cvs] jboss-seam/examples/wiki/view/themes/default ...

Christian Bauer christian at hibernate.org
Fri Jul 6 10:38:39 EDT 2007


  User: cbauer  
  Date: 07/07/06 10:38:39

  Modified:    examples/wiki/view/themes/default  template.xhtml
  Log:
  Compiles and runs on latest Seam CVS
  
  Revision  Changes    Path
  1.29      +94 -44    jboss-seam/examples/wiki/view/themes/default/template.xhtml
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: template.xhtml
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/examples/wiki/view/themes/default/template.xhtml,v
  retrieving revision 1.28
  retrieving revision 1.29
  diff -u -b -r1.28 -r1.29
  --- template.xhtml	21 Jun 2007 11:05:49 -0000	1.28
  +++ template.xhtml	6 Jul 2007 14:38:39 -0000	1.29
  @@ -31,6 +31,7 @@
           function jsf(id) {
               // Find the dynamic JSF client identifier by looking up
               // the static identifier of its j4j proxy child element
  +            if (document.getElementById(id) == null) { alert("Couldn't find JSF element: " + id); }
               var realId = document.getElementById(id).title;
               var element = document.getElementById(realId);
               return jQuery(element);
  @@ -68,14 +69,13 @@
   
               log("Raise error for tab: '" + tabId + "' field: " + fieldId);
   
  -            // Add an error message on the form message box
  +            // Add an error message to the client message box
               log("Adding error message: " +tabId + fieldId + "ErrorMessage")
  -            jQuery("#formMessageTable").append(
  +            jQuery("#clientMessageBoxTable").append(
                   '<tr id="' + tabId + fieldId + 'ErrorMessage"><td><img src="#{themePath}/img/attention.gif" ' +
                   'height="18" width="18" class="attentionImage"/></td>' +
                   '<td><span id="attentionMessage" class="attentionMessage">'+ message + '</span></td></tr>'
               );
  -
               if (formTabErrors[tabId] == null) {
                   formTabErrors[tabId] = 1;
               } else {
  @@ -88,7 +88,9 @@
               if (document.getElementById(tabId+fieldId+"ErrorMessage") != null) { // This error is displayed
                   log("Clear error for tab: '" + tabId + "' field: " + fieldId);
                   log("Removing error message: " +tabId + fieldId + "ErrorMessage")
  -                jQuery("#"+tabId + fieldId + "ErrorMessage").remove();  // Remove the error message on the form message box
  +                // Remove the error message on the client message box
  +                jQuery("#"+tabId + fieldId + "ErrorMessage").remove();
  +
                   formTabErrors[tabId]--;
                   formTabRenderErrors(tabId);
               }
  @@ -120,40 +122,66 @@
               }
   
               if (tabsHaveErrors) {
  -                log("Hiding save button");
  +                log("Hiding save button and showing form message box");
                   jQuery(".saveButton").hide();                       // Hide save button(s)
                   jQuery(".formControls").css("height", "30px");      // Adjust height for missing save button
  -                jQuery("#messageBox").empty();                      // Hide global messages
  -                jQuery("#formMessageTable").show();                 // Show form error messages
  +                jsf("messageBoxContainer_").hide();                 // Hide server messages
  +                jsf("clientMessageBoxContainer_").show();           // Show client error messages
               } else {
  -                log("Showing save button");
  +                log("Showing save button and hiding form message box");
                   jQuery(".saveButton").show();                       // Show save button(s)
                   jQuery(".formControls").css("height", "");          // Readjust height for present save button
  -                jQuery("#formMessageTable").hide();                 // Hide form error messages
  +                jsf("clientMessageBoxContainer_").hide();           // Hide client error messages
               }
           }
   
           function formTabClicked() {
  -            jQuery("#messageBox").empty(); // Hide global messages
  +            jsf("messageBoxContainer_").hide();                 // Hide server messages
           }
   
           function log(message) {
  -            /*
  +            return; // Remove to enable logging
               if (!log.window_ || log.window_.closed) {
                   var win = window.open("", null, "width=400,height=200," +
                                                   "scrollbars=yes,resizable=yes,status=no," +
                                                   "location=no,menubar=no,toolbar=no");
                   if (!win) return;
                   var doc = win.document;
  -                doc.write("<html><head><title>Debug Log</title></head><body></body></html>");
  +                doc.write("<html><head><title>Debug Log</title></head><body style='font-family: monospace'></body></html>");
                   doc.close();
                   log.window_ = win;
               }
               var logLine = log.window_.document.createElement("div");
               logLine.appendChild(log.window_.document.createTextNode(message));
               log.window_.document.body.appendChild(logLine);
  -            */
           }
  +
  +        // ###################### Design #################################
  +
  +        function clearContentBackground() {
  +            jQuery("#contentContainer").css("background", "none");
  +            jQuery("#contentContainer").css("padding", "0 0 0 0");
  +            jQuery("#contentContainer > div").css("background", "none");
  +            jQuery("#contentContainer > div").css("padding", "0 0 0 0");
  +            jQuery("#contentContainer > div > div").css("background", "none");
  +            jQuery("#contentContainer > div > div").css("padding", "0 0 0 0");
  +            jQuery("#contentContainer > div > div").css("border", "none");
  +        }
  +
  +        function clearDocumentBackground() {
  +            jQuery("#documentDisplayContainer").css("background", "none");
  +            jQuery("#documentDisplayContainer").css("padding", "0 0 0 0");
  +            jQuery("#documentDisplayContainer").css("padding", "0");
  +            jQuery("#documentDisplayContainer > div").css("background", "none");
  +            jQuery("#documentDisplayContainer > div").css("padding", "0 0 0 0");
  +            jQuery("#documentDisplayContainer > div > div").css("background", "none");
  +            jQuery("#documentDisplayContainer > div > div").css("padding", "0 0 0 0");
  +            jQuery("#documentDisplayContainer > div > div").css("border", "none");
  +            jsf("documentDisplay_").css("background", "none");
  +            jsf("documentDisplay_").css("padding", "0 0 0 0");
  +            jsf("documentDisplay_").css("border", "none");
  +        }
  +
       </script>
   
   </head>
  @@ -163,25 +191,25 @@
   <s:div id="screen">
   
       <s:div id="header">
  -        <div id="headerTopLeft">
  +        <div id="headerTopOne">
               <div class="screenname">
                   LaceWiki:&#160;<ui:insert name="screenname"/>
               </div>
           </div>
  -        <div id="headerTopRight">
  -            <ui:insert name="headerTopRight"/>
  +        <div id="headerTopTwo">
  +            <ui:insert name="headerTopTwo"/>
           </div>
  -        <div id="headerBottomLeft">
  -            <ui:insert name="headerBottomLeft"/>
  +        <div id="headerBottomOne">
  +            <ui:insert name="headerBottomOne"/>
           </div>
  -        <div id="headerBottomRight">
  -            <ui:insert name="headerBottomRight"/>
  +        <div id="headerBottomTwo">
  +            <ui:insert name="headerBottomTwo"/>
           </div>
       </s:div>
   
       <s:div id="control">
  -        <div id="controlLeft"><ui:insert name="controlLeft"/></div>
  -        <div id="controlRight">&#160;
  +        <div id="controlOne"><ui:insert name="controlOne"/></div>
  +        <div id="controlTwo">&#160;
               <h:form id="workspaceSwitcher" rendered="#{wiki:sizeOf(conversationList) > 0}">
                   <h:selectOneMenu value="#{switcher.conversationIdOrOutcome}"
                                    styleClass="workspaceSwitcherCombobox">
  @@ -190,7 +218,7 @@
                   <h:commandLink action="#{switcher.select}" accesskey="W"
                                styleClass="linkNavigation">Switch <u>W</u>orkspace</h:commandLink>
   
  -            </h:form><ui:insert name="controlRight"/></div>
  +            </h:form><ui:insert name="controlTwo"/></div>
       </s:div>
   
       <div id="controlSeparator">&#160;</div>
  @@ -200,10 +228,12 @@
       </s:div>
   
       <s:div id="body">
  -        <s:div id="messageBox" styleClass="messageBox"><j4j:idProxy id="messageBox_"/>
  -        <s:div rendered="#{!empty facesMessages.currentGlobalMessages}">
  +
  +        <s:div id="messageBoxContainer"><j4j:idProxy id="messageBoxContainer_"/>
  +        <s:div styleClass="shadowContainer" rendered="#{!empty facesMessages.currentGlobalMessages}"><div class="shadow1"><div class="shadow2">
  +            <div id="messageBox" class="messageBox">
               <ui:repeat var="message" value="#{facesMessages.currentGlobalMessages}">
  -                <h:panelGrid columns="2">
  +                    <h:panelGrid styleClass="messageBoxTable" columns="2" cellpadding="0" cellspacing="0" border="0">
                       <h:graphicImage value="/themes/#{wikiPreferences.themeName}/img/info.gif"
                                       width="18" height="18"
                                       styleClass="infoImage"/>
  @@ -218,11 +248,31 @@
                   </h:panelGrid>
                   -->
               </ui:repeat>
  +
  +                <script type="text/javascript">jQuery(function() {
  +                    jsf("messageBoxContainer_").css("margin-bottom", "10px");
  +                });</script>
  +            </div>
  +        </div></div></s:div>
           </s:div>
  +
  +        <s:div id="clientMessageBoxContainer" style="display:none;"><j4j:idProxy id="clientMessageBoxContainer_"/>
  +        <s:div styleClass="shadowContainer"><div class="shadow1"><div class="shadow2">
  +            <div id="clientMessageBox" class="messageBox">
  +                <table id="clientMessageBoxTable" class="messageBoxTable" cellpadding="0" cellspacing="0" border="0"/>
  +                <script type="text/javascript">jQuery(function() {
  +                    jsf("clientMessageBoxContainer_").css("margin-bottom", "10px");
  +                });</script>
  +            </div>
  +        </div></div></s:div>
           </s:div>
  -        <div id="content">
  +
  +        <s:div id="contentContainer" styleClass="shadowContainer"><div class="shadow1"><div class="shadow2">
  +            <s:div id="content" styleClass="content">
               <ui:insert name="content"/>
  -        </div>
  +            </s:div>
  +        </div></div></s:div>
  +
       </s:div>
   
       <div id="footer">
  
  
  



More information about the jboss-cvs-commits mailing list