Changeset 167 for Dev/trunk/classes


Ignore:
Timestamp:
11/25/11 13:58:17 (13 years ago)
Author:
fpvanagthoven
Message:
  • Save functie verbeterd, nu confirm? parameter.
  • Begin aan infopanel gemaakt
  • moveStep functie in JS gezet, werkt nog niet helemaal goed (refreshed niet!)
  • General CSS layout verbeterd van pipelineEditor.php
  • edit button werkt nu.
  • saveSession zit nog steeds een error in, nog niet weten te fixen. Heeft met creator te maken.
Location:
Dev/trunk/classes
Files:
4 edited

Legend:

Unmodified
Added
Removed

  • Dev/trunk/classes/Logo.php

    r164 r167  
    1717        echo '<div id="logo"><a href="index.php">Research Tool</a>';
    1818        if (isset($_SESSION['username'])) {
    19             echo '<a href="index.php" onClick="savePipeline();" style="font-size: 12pt;">Log out</a>';
     19            echo '<a href="index.php" onClick="savePipeline(true);" style="font-size: 12pt;">Log out</a>';
    2020        }
    2121        echo '</div>';

  • Dev/trunk/classes/PipelineInfoPanel.php

    r146 r167  
    11<?php
    2 
    32/*
    43 * To change this template, choose Tools | Templates
    … …  
    1211 */
    1312class PipelineInfoPanel {
     13
    1414    private $linkedSequencer;
    15    
    16     public function __construct(){
    17        
     15
     16    public function __construct() {
     17        ?>
     18        <div>
     19            <fieldset id="infoPanel">
     20                <div class="fieldsetTitle">
     21                    Title
     22                </div>
     23                <div id="infoContent">
     24                    Info goes here
     25                </div>
     26            </fieldset>
     27        </div>
     28        <?php
    1829    }
     30
    1931}
    20 
    2132?>

  • Dev/trunk/classes/Toolbox.php

    r165 r167  
    1818        <form name="toolbox" action="pipelineEditor.php" method="POST">
    1919            <fieldset id="toolbox">
    20                 <div class="title">Toolbox</div>
     20                <div class="fieldsetTitle">Toolbox</div><br /><br />
    2121                <p>Add new: </p>
    22 <!--                <div class="creationButton" onClick="document.toolbox.objectToCreate.value = 'Survey'; SubmitToolbox();"><img src="images/icons/survey.png" class="buttonIcon"/><p>Survey</p></div>
    23                 <div class="creationButton" onClick="document.toolbox.objectToCreate.value = 'Application'; SubmitToolbox();"><img src="images/icons/application.png" class="buttonIcon"/><p>Application</p></div>
    24                 <div class="creationButton" onClick="document.toolbox.objectToCreate.value = 'Dashboard'; SubmitToolbox();"><img src="images/icons/dashboard.png" class="buttonIcon"/><p>Dashboard</p></div>-->
    2522                <div class="creationButton" onClick="SubmitToolbox('Survey');"><img src="images/icons/survey.png" class="buttonIcon"/><p>Survey</p></div>
    2623                <div class="creationButton" onClick="SubmitToolbox('Application');"><img src="images/icons/application.png" class="buttonIcon"/><p>Application</p></div>
    2724                <div class="creationButton" onClick="SubmitToolbox('Dashboard');"><img src="images/icons/dashboard.png" class="buttonIcon"/><p>Dashboard</p></div>
    28                 <input type="hidden" name="objectToCreate" />
    29 
    3025            </fieldset>
    3126        </form>

  • Dev/trunk/classes/pipelineSequencer.php

    r166 r167  
    3131                $stringPipeline .= "$object->uid,";
    3232                $stringPipelineType .= get_class($object) . ",";
    33                 $stringPipelineUpdated .= "1,";
     33                $stringPipelineUpdated .= "0,";
    3434                $numberOfSteps++;
    3535            }
    … …  
    4242        <br /><form name="sequencerForm" action="pipelineEditor.php" method="post">
    4343            <fieldset id="sequencer">
    44                 <div class="title">Name: <?php echo $this->loadedSession->title; ?> </div>
     44                <div class="fieldsetTitle">Name: <?php echo $this->loadedSession->title; ?> </div>
    4545
    46                 <div id="seqContent"></div>
     46                <div id="seqContent">
     47                    <div id="seqContentWrapper"></div>
     48                </div>
    4749
    4850                <div id="controls">
    49                     <input type="submit" id="moveSelectedLeft" name="moveSelectedLeft" value="< Move" class="surveyButton" />
    50                     <input type="submit" id="moveSelectedRight" name="moveSelectedRight" value="Move >" class="surveyButton" />
    51                     <input type="submit" id="editSelected" name="editSelected" value="Edit step" class="surveyButton" />
     51                    <input type="button" id="moveSelectedL" value="< Move" class="surveyButton"  onClick="moveStep(-1);" />
     52                    <input type="button" id="moveSelectedR" value="Move >" class="surveyButton"  onClick="moveStep(1);" />
     53                    <input type="button" id="editSelected" value="Edit step" class="surveyButton" />
    5254                    <input type="submit" id="deleteSelected" name="deleteSelected" value="Delete step" class="surveyButton" />
    5355                    <input type="submit" id ="clearPipeline" name="clearPipeline" value="Clear pipeline" class="surveyButton dis" disabled="true"/>
    5456                    <input type="checkbox" id="confirmClear" name="confirmClear" onChange="IsCheckEnabled(this, document.getElementById('clearPipeline'));" />Really clear?
    55                     <input type="button" id="t_saveSession" name="t_saveSession" onClick="savePipeline();" value="t_Save_session!" />
     57                    <input type="button" id="t_saveSession" name="t_saveSession" onClick="savePipeline(true);" value="t_Save_session!" />
    5658                    <input type="button" id="t_setOOD" name="t_setOOD" onClick="t_setOutOfDate();" value="t_Set_OOD" />
    5759                    <input type="button" id="t_updateSeq" name="t_updateSeq" onClick="updateSequencer();" value="t_Update_Seq" />
    … …  
    8385
    8486    public function Javascript() {
    85         $pipelineString = "ERROR";
    86 
    87         echo "<!--$pipelineString-->";
    8887        ?>
    8988        <script type="text/javascript" src="js/sequencerScripts.js"></script>
    … …  
    9190        <script type="text/javascript">
    9291            $(document).ready(function() {
    93                 drawSteps();
     92                updateSequencer();
    9493            });
    9594        </script>
Note: See TracChangeset for help on using the changeset viewer.