Changeset 168 for Dev/trunk/classes

Timestamp:

11/29/11 17:26:07 (13 years ago)

Author:

fpvanagthoven

Message:

• moveStep() [js] werkt weer, editor is nu op delete/clear na helemaal functioneel
• Zit nog steeds een creator bug in savesession.php en selectSession.php
• getInfo.php is nu aangepast om voor meerdere objecttypes te werken en relevante informatie terug te geven, geformatteerd als table. De styling hiervan moet wel nog beter geregeld worden.

Location:

Dev/trunk/classes

Files:

• Logo.php (modified) (1 diff)
• PipelineInfoPanel.php (modified) (1 diff)
• Toolbox.php (modified) (1 diff)
• pipelineSequencer.php (modified) (3 diffs)

Dev/trunk/classes/Logo.php

@@ -17 +17 @@
         echo '<div id="logo"><a href="index.php">Research Tool</a>';
         if (isset($_SESSION['username'])) {
-            echo '<a href="index.php" onClick="savePipeline(true);" style="font-size: 12pt;">Log out</a>';
+            echo '<a href="index.php" onClick="savePipeline(true);" style="display:block; font-size: 12px;">Log out</a>';
         }
         echo '</div>';

Dev/trunk/classes/PipelineInfoPanel.php

@@ -21 +21 @@
                     Title
                 </div>
-                <div id="infoContent">
-                    Info goes here
+                <div id="infoPanelContent">
+                    
                 </div>
             </fieldset>

Dev/trunk/classes/Toolbox.php

@@ -18 +18 @@
         <form name="toolbox" action="pipelineEditor.php" method="POST">
             <fieldset id="toolbox">
-                <div class="fieldsetTitle">Toolbox</div><br /><br />
+                <div class="fieldsetTitle">Toolbox</div>
                 <p>Add new: </p>
                 <div class="creationButton" onClick="SubmitToolbox('Survey');"><img src="images/icons/survey.png" class="buttonIcon"/><p>Survey</p></div>

Dev/trunk/classes/pipelineSequencer.php

@@ -51 +51 @@
                     <input type="button" id="moveSelectedL" value="< Move" class="surveyButton"  onClick="moveStep(-1);" />
                     <input type="button" id="moveSelectedR" value="Move >" class="surveyButton"  onClick="moveStep(1);" />
-                    <input type="button" id="editSelected" value="Edit step" class="surveyButton" />
+                    <input type="button" id="editSelected" value="Edit step" class="surveyButton" onClick="editStep();" />
                     <input type="submit" id="deleteSelected" name="deleteSelected" value="Delete step" class="surveyButton" />
                     <input type="submit" id ="clearPipeline" name="clearPipeline" value="Clear pipeline" class="surveyButton dis" disabled="true"/>
                     <input type="checkbox" id="confirmClear" name="confirmClear" onChange="IsCheckEnabled(this, document.getElementById('clearPipeline'));" />Really clear?
-                    <input type="button" id="t_saveSession" name="t_saveSession" onClick="savePipeline(true);" value="t_Save_session!" />
-                    <input type="button" id="t_setOOD" name="t_setOOD" onClick="t_setOutOfDate();" value="t_Set_OOD" />
-                    <input type="button" id="t_updateSeq" name="t_updateSeq" onClick="updateSequencer();" value="t_Update_Seq" />
+                    <input type="button" value="debug_save" onClick="savePipeline(true);" />
                 </div>
                 <div id="hiddenInputs">
@@ -72 +70 @@
     }
 
-    public function DrawSteps() {
-        // Use AJAX to draw visual representations of step objects in a pipeline
-        // <TODO> Implement parameters such as screen size in the drawing of objects </TODO>
-        ?>
-        <script type="text/javascript">
-            drawSteps();
-        </script>
-
-
-        <?php
-    }
+    
 
     public function Javascript() {
@@ -90 +78 @@
         <script type="text/javascript">
             $(document).ready(function() {
-                updateSequencer();
+                updateSequencer(true);      // true means it is the first refresh of the page.
             });
         </script>