Changeset 181 for Dev/trunk/classes


Ignore:
Timestamp:
12/09/11 16:10:36 (13 years ago)
Author:
fpvanagthoven
Message:
  • Grote verbetering aan scripts. Opgedeeld in generalScripts voor algemene functies, sequencerScripts.js staat nu de laatste versie van de editor in. Deze is bijna helemaal geschikt om zowel horizontaal als verticaal te gebruiken. updateSequencer() functie werkt nog niet helemaal (alleen op firstload), maar alle andere functies doen het nu EN werken nu op JS variables in plaats van hidden fields. Stukken beter.
  • css files nog wat verder aangepast.
  • pipelineSequencer.php aangepast om nu onLoad te beginnen met loadSequencer().js ipv drawSteps().js
File:
1 edited

Legend:

Unmodified
Added
Removed

  • Dev/trunk/classes/pipelineSequencer.php

    r178 r181  
    6060           
    6161            <div id="hiddenInputs">
    62                 <input type="hidden" name="selectedStep" id="selectedStepField" value="" />
    63                 <input type="hidden" name="pipelineString" id="pipelineStringField" value="<?php echo $stringPipeline; ?>" />
    64                 <input type="hidden" name="pipelineTypes" id="pipelineTypeField" value="<?php echo $stringPipelineType; ?>" />
    65                 <input type="hidden" name="pipelineUpDated" id="pipelineUpdatedField" value="<?php echo $stringPipelineUpdated; ?>" />
    66                 <input type="hidden" name="numSteps" id="numSteps" value="<?php echo $numberOfSteps; ?>" />
    67                 <input type="hidden" name="session" id="sessionField" value="<?php echo $this->loadedSession->uid; ?>" />
     62                <input type="hidden" id="selectedStepField" value="" />
     63                <input type="hidden" id="pipelineStringField" value="<?php echo $stringPipeline; ?>" />
     64                <input type="hidden" id="pipelineTypeField" value="<?php echo $stringPipelineType; ?>" />
     65                <input type="hidden" id="pipelineUpdatedField" value="<?php echo $stringPipelineUpdated; ?>" />
     66                <input type="hidden" id="numSteps" value="<?php echo $numberOfSteps; ?>" />
     67                <input type="hidden" id="sessionField" value="<?php echo $this->loadedSession->uid; ?>" />
     68                <input type="hidden" id="sessionTitleField" value="<?php echo $this->loadedSession->title; ?>" />
    6869            </div>
    6970        </div>
    7071
    71         <!--
    72         <form name="sequencerForm" action="pipelineEditor.php" method="post">
    73             <fieldset id="sequencer">
    74                 <div class="fieldsetTitle">Name: <?php echo $this->loadedSession->title; ?> </div>
    75 
    76                 <div id="seqContent">
    77                     <div id="seqContentWrapper"></div>
    78                 </div>
    79 
    80                 <div id="controls">
    81                     <input type="button" id="moveSelectedL" value="< Move" class="surveyButton"  onClick="moveStep(-1);" />
    82                     <input type="button" id="moveSelectedR" value="Move >" class="surveyButton"  onClick="moveStep(1);" />
    83                     <input type="button" id="editSelected" value="Edit step" class="surveyButton" onClick="editStep();" />
    84                     <input type="button" id="deleteSelected" value="Delete step" class="surveyButton" onClick="deleteStep();" />
    85                     <input type="submit" id ="clearPipeline" name="clearPipeline" value="Clear pipeline" class="surveyButton dis" disabled="true"/>
    86                     <input type="checkbox" id="confirmClear" name="confirmClear" onChange="IsCheckEnabled(this, document.getElementById('clearPipeline'));" />Really clear?
    87                     <input type="button" value="debug_save" onClick="savePipeline(true);" />
    88                 </div>
    89                 <div id="hiddenInputs">
    90                     <input type="hidden" name="selectedStep" id="selectedStepField" value="" />
    91                     <input type="hidden" name="pipelineString" id="pipelineStringField" value="<?php echo $stringPipeline; ?>" />
    92                     <input type="hidden" name="pipelineTypes" id="pipelineTypeField" value="<?php echo $stringPipelineType; ?>" />
    93                     <input type="hidden" name="pipelineUpDated" id="pipelineUpdatedField" value="<?php echo $stringPipelineUpdated; ?>" />
    94                     <input type="hidden" name="numSteps" id="numSteps" value="<?php echo $numberOfSteps; ?>" />
    95                     <input type="hidden" name="session" id="sessionField" value="<?php echo $this->loadedSession->uid; ?>" />
    96                 </div>
    97             </fieldset>
    98         </form>
    99         -->
     72       
    10073        <?php
    10174    }
    … …  
    10376    public function Javascript() {
    10477        ?>
     78        <script type="text/javascript" src="js/generalScripts.js"></script>
    10579        <script type="text/javascript" src="js/sequencerScripts.js"></script>
    10680        <script type="text/javascript" src="js/jquery.js"></script>
    10781        <script type="text/javascript">
    10882            $(document).ready(function() {
    109                 updateSequencer(true);      // true means it is the first refresh of the page.
     83                loadSequencer();      // true means it is the first refresh of the page.
    11084            });
    11185        </script>
    … …  
    172146    }
    173147
    174     // Dit is een pure php versie. Deze slaat nog niet op in de Database, en reageert nog niet op
    175     public function MoveStep($uid, $direction) {
    176         $newSession = $this->loadedSession;
    177 
    178         for ($i = 0; $i < count($newSession->pipeline); $i++) {
    179             if ($newSession->pipeline[$i]->uid == $uid) {
    180                 $temp = $newSession->pipeline[$i];
    181                 $newSession->pipeline[$i] = $newSession->pipeline[$i + $direction];
    182                 $newSession->pipeline[$i + $direction] = $temp;
    183                 break;
    184             }
    185         }
    186 
    187         $this->loadedSession = $newSession;
    188         redirect("pipelineEditor.php");
    189     }
    190 
    191148}
    192149?>
Note: See TracChangeset for help on using the changeset viewer.