incubator-ambari-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jiten...@apache.org
Subject svn commit: r1339449 - in /incubator/ambari/branches/ambari-186: CHANGES.txt hmc/html/addNodesWizard.php hmc/html/clusters.php hmc/html/initializeCluster.php hmc/html/manageServices.php hmc/html/txnUtils.htmli hmc/html/utils.htmli
Date Thu, 17 May 2012 02:43:13 GMT
Author: jitendra
Date: Thu May 17 02:43:13 2012
New Revision: 1339449

URL: http://svn.apache.org/viewvc?rev=1339449&view=rev
Log:
AMBARI-197. Templatize Standard Helper Components Of Every HTML Page. Contributed by Varun
Kapoor.

Added:
    incubator/ambari/branches/ambari-186/hmc/html/txnUtils.htmli
    incubator/ambari/branches/ambari-186/hmc/html/utils.htmli
Modified:
    incubator/ambari/branches/ambari-186/CHANGES.txt
    incubator/ambari/branches/ambari-186/hmc/html/addNodesWizard.php
    incubator/ambari/branches/ambari-186/hmc/html/clusters.php
    incubator/ambari/branches/ambari-186/hmc/html/initializeCluster.php
    incubator/ambari/branches/ambari-186/hmc/html/manageServices.php

Modified: incubator/ambari/branches/ambari-186/CHANGES.txt
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/ambari-186/CHANGES.txt?rev=1339449&r1=1339448&r2=1339449&view=diff
==============================================================================
--- incubator/ambari/branches/ambari-186/CHANGES.txt (original)
+++ incubator/ambari/branches/ambari-186/CHANGES.txt Thu May 17 02:43:13 2012
@@ -2,6 +2,8 @@ Ambari Change log
 
 Release 0.x.x - unreleased
 
+  AMBARI-197. Templatize Standard Helper Components Of Every HTML Page. (Varun Kapoor via
jitendra)
+
   AMBARI-229. Remove Navigation Bar (W/ Clusters Link) From InstallationWizard (And Other
Entry Points). 
   (Varun Kapoor via jitendra)
 

Modified: incubator/ambari/branches/ambari-186/hmc/html/addNodesWizard.php
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/ambari-186/hmc/html/addNodesWizard.php?rev=1339449&r1=1339448&r2=1339449&view=diff
==============================================================================
--- incubator/ambari/branches/ambari-186/hmc/html/addNodesWizard.php (original)
+++ incubator/ambari/branches/ambari-186/hmc/html/addNodesWizard.php Thu May 17 02:43:13 2012
@@ -46,11 +46,8 @@
         </div>
         
         <br/>
-                <div id="formStatusDivId" class="formStatusBar" style="display:none">
-          <div id="formStatusCoreDivId" stle="display:none">
-          </div>
-        </div>
 
+        <?php require "./utils.htmli"; ?>
 
         <div name="installationMainFormsDiv" id="installationMainFormsDivId">
          
@@ -106,38 +103,13 @@
                 <input type="button" name="deployAddedNodesSubmitButton" id="deployAddedNodesSubmitButtonId"
value="Deploy Nodes" class="submitButton">
                 </p>
               </div>
-                <div name="txnProgressCoreDiv" id="txnProgressCoreDivId" style="display:none">
 
-                   <!-- Used to render informational/status messages (error, success reports
and such like) -->
-                <div id="txnProgressStatusDivId" class="formStatusBar" style="display:none">
-                  <div id="txnProgressStatusMessageDivId"></div>
-                  <div id="txnProgressStatusActionsDivId"></div>
-                </div>
- 
-                  <fieldset id="txnProgressFieldSetId">
-               <!--     <legend>Display Progress</legend> -->
-                    <div id="txnProgressDynamicRenderDivId"></div>
-                  </fieldset>
-                </div>
+              <?php require "./txnUtils.htmli"; ?>
 
               </div>
             </div>
             <!-- End of installation Wizard -->
 
-            <!-- The mechanism by which we black out the screen and affix the
-                 the spotlight on a smaller portion of it. -->
-            <div id="blackScreenDivId" style="display:none"></div>
-            <!-- The image we use to let users know something is loading, and 
-                 that they should wait. -->
-            <div id="loadingDivId" style="display:none">
-              <div id="loadingBlackScreenDivId"></div>
-              <img id="loadingImgId" src="../images/loadingLarge.gif"/>
-            </div>
-
-            <!-- Placeholder for our informational YUI panel. -->
-            <div id="informationalPanelContainerDivId">
-            </div>
-
             <hr/>
             <?php require "./footer.html"; ?>
 

Modified: incubator/ambari/branches/ambari-186/hmc/html/clusters.php
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/ambari-186/hmc/html/clusters.php?rev=1339449&r1=1339448&r2=1339449&view=diff
==============================================================================
--- incubator/ambari/branches/ambari-186/hmc/html/clusters.php (original)
+++ incubator/ambari/branches/ambari-186/hmc/html/clusters.php Thu May 17 02:43:13 2012
@@ -22,6 +22,8 @@
 
     <div id="contentDivId"> 
 
+      <?php require "./utils.htmli"; ?>
+
       <!-- The Main Event -->
       <div id="clustersCoreDivId">
         <div id="clustersNavigationLinksDivId">
@@ -51,32 +53,7 @@
       </div>
       <!-- End of clustersCoreDivId -->
 
-      <div id="txnProgressCoreDivId" style="display:none">
-
-        <!-- Used to render informational/status messages (error, success reports and
such like) -->
-        <div id="txnProgressStatusDivId" class="formStatusBar" style="display:none">
-          <div id="txnProgressStatusMessageDivId"></div>
-          <div id="txnProgressStatusActionsDivId"></div>
-        </div>
-
-        <fieldset id="txnProgressFieldSetId">
-          <div id="txnProgressDynamicRenderDivId"></div>
-        </fieldset>
-      </div>
-      <!-- End of txnProgressCoreDivId -->
-
-      <!-- The mechanism by which we black out the screen and affix the
-           the spotlight on a smaller portion of it. -->
-      <div id="blackScreenDivId" style="display:none"></div>
-      <!-- The image we use to let users know something is loading, and 
-           that they should wait. -->
-      <div id="loadingDivId"> 
-        <div id="loadingBlackScreenDivId"></div>
-        <img id="loadingImgId" src="../images/loadingLarge.gif"/>
-      </div>
-
-      <!-- Placeholder for our informational YUI panel. -->
-      <div id="informationalPanelContainerDivId"></div>
+      <?php require "./txnUtils.htmli"; ?>
 
     </div>
     <!-- End of contentDivId -->

Modified: incubator/ambari/branches/ambari-186/hmc/html/initializeCluster.php
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/ambari-186/hmc/html/initializeCluster.php?rev=1339449&r1=1339448&r2=1339449&view=diff
==============================================================================
--- incubator/ambari/branches/ambari-186/hmc/html/initializeCluster.php (original)
+++ incubator/ambari/branches/ambari-186/hmc/html/initializeCluster.php Thu May 17 02:43:13
2012
@@ -85,10 +85,8 @@
           </ol>
         </div>
         
-        <!-- Used to render informational/status messages (error, success reports and
such like) -->
-        <div id="formStatusDivId" class="formStatusBar" style="visibility:hidden">Nothing
-        </div>
-       
+        <?php require "./utils.htmli"; ?>
+
         <div name="installationMainFormsDiv" id="installationMainFormsDivId">
          
           <div name ="createClusterCoreDiv" id="createClusterCoreDivId">
@@ -244,39 +242,14 @@
                   </form>
                 </div>
 
-                <div id="txnProgressCoreDivId" style="display:none">
-
-                  <!-- Used to render informational/status messages (error, success reports
and such like) -->
-                  <div id="txnProgressStatusDivId" class="formStatusBar" style="display:none">
-                    <div id="txnProgressStatusMessageDivId"></div>
-                    <div id="txnProgressStatusActionsDivId"></div>
-                  </div>
- 
-                  <fieldset id="txnProgressFieldSetId">
-               <!--     <legend>Display Progress</legend> -->
-                    <div id="txnProgressDynamicRenderDivId"></div>
-                  </fieldset>
-                </div>
+                <?php require "./txnUtils.htmli"; ?>
 
               </div>
             </div>
             <!-- End of installation Wizard -->
 
-            <!-- The mechanism by which we black out the screen and affix the
-                 the spotlight on a smaller portion of it. -->
-            <div id="blackScreenDivId" style="display:none"></div>
-            <!-- The image we use to let users know something is loading, and 
-                 that they should wait. -->
-            <div id="loadingDivId" style="display:none">
-              <div id="loadingBlackScreenDivId"></div>
-              <img id="loadingImgId" src="../images/loadingLarge.gif"/>
-            </div>
-
-            <!-- Placeholder for our informational YUI panel. -->
-            <div id="informationalPanelContainerDivId">
-            </div>
-
             <hr/>
+
             <?php require "./footer.html"; ?>
 
             <!-- Javascript Scaffolding -->

Modified: incubator/ambari/branches/ambari-186/hmc/html/manageServices.php
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/ambari-186/hmc/html/manageServices.php?rev=1339449&r1=1339448&r2=1339449&view=diff
==============================================================================
--- incubator/ambari/branches/ambari-186/hmc/html/manageServices.php (original)
+++ incubator/ambari/branches/ambari-186/hmc/html/manageServices.php Thu May 17 02:43:13 2012
@@ -26,6 +26,8 @@
 
     <div id="contentDivId"> 
 
+      <?php require "./utils.htmli"; ?>
+
       <!-- Service Management: The Main Event -->
       <div id="serviceManagementCoreDivId">
         <ul id="serviceManagementListId">
@@ -96,32 +98,7 @@
       </div>
       <!-- End of serviceManagementCoreDivId -->
 
-      <div id="txnProgressCoreDivId" style="display:none">
-
-        <!-- Used to render informational/status messages (error, success reports and
such like) -->
-        <div id="txnProgressStatusDivId" class="formStatusBar" style="display:none">
-          <div id="txnProgressStatusMessageDivId"></div>
-          <div id="txnProgressStatusActionsDivId"></div>
-        </div>
-
-        <fieldset id="txnProgressFieldSetId">
-          <div id="txnProgressDynamicRenderDivId"></div>
-        </fieldset>
-      </div>
-      <!-- End of txnProgressCoreDivId -->
-
-      <!-- The mechanism by which we black out the screen and affix the
-           the spotlight on a smaller portion of it. -->
-      <div id="blackScreenDivId" style="display:none"></div>
-      <!-- The image we use to let users know something is loading, and 
-           that they should wait. -->
-      <div id="loadingDivId" style="display:none">
-        <div id="loadingBlackScreenDivId"></div>
-        <img id="loadingImgId" src="../images/loadingLarge.gif"/>
-      </div>
-
-      <!-- Placeholder for our informational YUI panel. -->
-      <div id="informationalPanelContainerDivId"></div>
+      <?php require "./txnUtils.htmli"; ?>
 
     </div>
     <!-- End of contentDivId -->

Added: incubator/ambari/branches/ambari-186/hmc/html/txnUtils.htmli
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/ambari-186/hmc/html/txnUtils.htmli?rev=1339449&view=auto
==============================================================================
--- incubator/ambari/branches/ambari-186/hmc/html/txnUtils.htmli (added)
+++ incubator/ambari/branches/ambari-186/hmc/html/txnUtils.htmli Thu May 17 02:43:13 2012
@@ -0,0 +1,13 @@
+<div id="txnProgressCoreDivId" style="display:none">
+
+  <!-- Used to render informational/status messages (error, success reports and such like)
-->
+  <div id="txnProgressStatusDivId" class="formStatusBar" style="display:none">
+    <div id="txnProgressStatusMessageDivId"></div>
+    <div id="txnProgressStatusActionsDivId"></div>
+  </div>
+
+  <fieldset id="txnProgressFieldSetId">
+    <div id="txnProgressDynamicRenderDivId"></div>
+  </fieldset>
+</div>
+<!-- End of txnProgressCoreDivId -->

Added: incubator/ambari/branches/ambari-186/hmc/html/utils.htmli
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/ambari-186/hmc/html/utils.htmli?rev=1339449&view=auto
==============================================================================
--- incubator/ambari/branches/ambari-186/hmc/html/utils.htmli (added)
+++ incubator/ambari/branches/ambari-186/hmc/html/utils.htmli Thu May 17 02:43:13 2012
@@ -0,0 +1,21 @@
+<!-- Used to render informational/status messages 
+     (error, success reports and such like) -->
+<div id="formStatusDivId" class="formStatusBar" style="visibility:hidden">
+  DummyPlaceholder
+</div>
+
+<!-- The mechanism by which we black out the screen and affix the
+     the spotlight on a smaller portion of it. -->
+<div id="blackScreenDivId" style="display:none"></div>
+
+<!-- The image we use to let users know something is loading, and 
+     that they should wait. Starts off showing by default, so it's
+     up to the container application to hide this using the 
+     hideLoadingImg() method from utils.js. -->
+<div id="loadingDivId">
+  <div id="loadingBlackScreenDivId"></div>
+  <img id="loadingImgId" src="../images/loadingLarge.gif"/>
+</div>
+
+<!-- Placeholder for our informational YUI panel. -->
+<div id="informationalPanelContainerDivId"></div>



Mime
View raw message