Changeset 246 for Dev


Ignore:
Timestamp:
02/07/12 20:17:58 (13 years ago)
Author:
hendrikvanantwerpen
bzr:base-revision:
svn-v4:e1b9dffa-5495-0410-85d9-cf58ec4b5d15::245
bzr:committer:
Hendrik van Antwerpen <hendrik@van-antwerpen.net>
bzr:file-ids:

Dev/branches/jQueryUI/api.php 244@e1b9dffa-5495-0410-85d9-cf58ec4b5d15:%2FDev%2Fbranches%2FjQueryUI%2Fapi.php
Dev/branches/jQueryUI/index.php 243@e1b9dffa-5495-0410-85d9-cf58ec4b5d15:%2FDev%2Fbranches%2FjQueryUI%2Findex.php
Dev/branches/jQueryUI/js/api.js api.js-20120207184802-m5kfm0pir6sqj2uh-2
Dev/branches/jQueryUI/js/main.js 244@e1b9dffa-5495-0410-85d9-cf58ec4b5d15:%2FDev%2Fbranches%2FjQueryUI%2Fjs%2Fmain.js
Dev/branches/jQueryUI/pages pages-20120207184802-m5kfm0pir6sqj2uh-1
Dev/branches/jQueryUI/pages/mainmenu mainmenu-20120207184802-m5kfm0pir6sqj2uh-3
Dev/branches/jQueryUI/pages/mainmenu/mainmenu.html mainmenu.html-20120207184802-m5kfm0pir6sqj2uh-4
Dev/branches/jQueryUI/pages/mainmenu/mainmenu.js mainmenu.js-20120207184802-m5kfm0pir6sqj2uh-5
Dev/branches/jQueryUI/pages_old pages_old-20120207183338-efh29iiqrn2j7s8h-1
Dev/branches/jQueryUI/pages_old/applicationcreation.php 243@e1b9dffa-5495-0410-85d9-cf58ec4b5d15:%2FDev%2Fbranches%2FjQueryUI%2Fapplicationcreation.php
Dev/branches/jQueryUI/pages_old/createObject.php 243@e1b9dffa-5495-0410-85d9-cf58ec4b5d15:%2FDev%2Fbranches%2FjQueryUI%2FcreateObject.php
Dev/branches/jQueryUI/pages_old/createapplication.php 243@e1b9dffa-5495-0410-85d9-cf58ec4b5d15:%2FDev%2Fbranches%2FjQueryUI%2Fcreateapplication.php
Dev/branches/jQueryUI/pages_old/createsurvey.php 243@e1b9dffa-5495-0410-85d9-cf58ec4b5d15:%2FDev%2Fbranches%2FjQueryUI%2Fcreatesurvey.php
Dev/branches/jQueryUI/pages_old/dashboard.php 243@e1b9dffa-5495-0410-85d9-cf58ec4b5d15:%2FDev%2Fbranches%2FjQueryUI%2Fdashboard.php
Dev/branches/jQueryUI/pages_old/database_example.php 243@e1b9dffa-5495-0410-85d9-cf58ec4b5d15:%2FDev%2Fbranches%2FjQueryUI%2Fdatabase_example.php
Dev/branches/jQueryUI/pages_old/getInfo.php 243@e1b9dffa-5495-0410-85d9-cf58ec4b5d15:%2FDev%2Fbranches%2FjQueryUI%2FgetInfo.php
Dev/branches/jQueryUI/pages_old/getObject.php 243@e1b9dffa-5495-0410-85d9-cf58ec4b5d15:%2FDev%2Fbranches%2FjQueryUI%2FgetObject.php
Dev/branches/jQueryUI/pages_old/logout.php 243@e1b9dffa-5495-0410-85d9-cf58ec4b5d15:%2FDev%2Fbranches%2FjQueryUI%2Flogout.php
Dev/branches/jQueryUI/pages_old/mainmenu.php 243@e1b9dffa-5495-0410-85d9-cf58ec4b5d15:%2FDev%2Fbranches%2FjQueryUI%2Fmainmenu.php
Dev/branches/jQueryUI/pages_old/questionEditor.php 243@e1b9dffa-5495-0410-85d9-cf58ec4b5d15:%2FDev%2Fbranches%2FjQueryUI%2FquestionEditor.php
Dev/branches/jQueryUI/pages_old/questionEditor_old.php 243@e1b9dffa-5495-0410-85d9-cf58ec4b5d15:%2FDev%2Fbranches%2FjQueryUI%2FquestionEditor_old.php
Dev/branches/jQueryUI/pages_old/questioncreation.php 243@e1b9dffa-5495-0410-85d9-cf58ec4b5d15:%2FDev%2Fbranches%2FjQueryUI%2Fquestioncreation.php
Dev/branches/jQueryUI/pages_old/register.php 243@e1b9dffa-5495-0410-85d9-cf58ec4b5d15:%2FDev%2Fbranches%2FjQueryUI%2Fregister.php
Dev/branches/jQueryUI/pages_old/returnObjectDisplay.php 243@e1b9dffa-5495-0410-85d9-cf58ec4b5d15:%2FDev%2Fbranches%2FjQueryUI%2FreturnObjectDisplay.php
Dev/branches/jQueryUI/pages_old/saveSurvey.php 243@e1b9dffa-5495-0410-85d9-cf58ec4b5d15:%2FDev%2Fbranches%2FjQueryUI%2FsaveSurvey.php
Dev/branches/jQueryUI/pages_old/savesession.php 243@e1b9dffa-5495-0410-85d9-cf58ec4b5d15:%2FDev%2Fbranches%2FjQueryUI%2Fsavesession.php
Dev/branches/jQueryUI/pages_old/selectObject.php 243@e1b9dffa-5495-0410-85d9-cf58ec4b5d15:%2FDev%2Fbranches%2FjQueryUI%2FselectObject.php
Dev/branches/jQueryUI/pages_old/selectQuestion.php 243@e1b9dffa-5495-0410-85d9-cf58ec4b5d15:%2FDev%2Fbranches%2FjQueryUI%2FselectQuestion.php
Dev/branches/jQueryUI/pages_old/selectSession.php 243@e1b9dffa-5495-0410-85d9-cf58ec4b5d15:%2FDev%2Fbranches%2FjQueryUI%2FselectSession.php
Dev/branches/jQueryUI/pages_old/sessionEditor.php 243@e1b9dffa-5495-0410-85d9-cf58ec4b5d15:%2FDev%2Fbranches%2FjQueryUI%2FsessionEditor.php
Dev/branches/jQueryUI/pages_old/sessioncreation.php 243@e1b9dffa-5495-0410-85d9-cf58ec4b5d15:%2FDev%2Fbranches%2FjQueryUI%2Fsessioncreation.php
Dev/branches/jQueryUI/pages_old/setQuestion.php 243@e1b9dffa-5495-0410-85d9-cf58ec4b5d15:%2FDev%2Fbranches%2FjQueryUI%2FsetQuestion.php
Dev/branches/jQueryUI/pages_old/submitsurvey.php 243@e1b9dffa-5495-0410-85d9-cf58ec4b5d15:%2FDev%2Fbranches%2FjQueryUI%2Fsubmitsurvey.php
Dev/branches/jQueryUI/pages_old/survey.php 243@e1b9dffa-5495-0410-85d9-cf58ec4b5d15:%2FDev%2Fbranches%2FjQueryUI%2Fsurvey.php
Dev/branches/jQueryUI/pages_old/surveyEditor.php 243@e1b9dffa-5495-0410-85d9-cf58ec4b5d15:%2FDev%2Fbranches%2FjQueryUI%2FsurveyEditor.php
Dev/branches/jQueryUI/pages_old/surveycreation.php 243@e1b9dffa-5495-0410-85d9-cf58ec4b5d15:%2FDev%2Fbranches%2FjQueryUI%2Fsurveycreation.php
Dev/branches/jQueryUI/pages_old/testpage.php 243@e1b9dffa-5495-0410-85d9-cf58ec4b5d15:%2FDev%2Fbranches%2FjQueryUI%2Ftestpage.php
bzr:mapping-version:
v4
bzr:repository-uuid:
e1b9dffa-5495-0410-85d9-cf58ec4b5d15
bzr:revision-id:
hendrik@van-antwerpen.net-20120207191752-mbokj4rwqv8oi8bk
bzr:revno:
247
bzr:revprop:branch-nick:
RESEARCHTOOL
bzr:testament:

bazaar-ng testament short form 2.1
revision-id: hendrik@van-antwerpen.net-20120207191752-mbokj4rwqv8oi8bk
sha1: c1fd6b38fd940951a78e3d220e90c8e2487cc79d
bzr:text-parents:

Dev/branches/jQueryUI/api.php svn-v4:e1b9dffa-5495-0410-85d9-cf58ec4b5d15::244
Dev/branches/jQueryUI/index.php svn-v4:e1b9dffa-5495-0410-85d9-cf58ec4b5d15::244
Dev/branches/jQueryUI/js/api.js
Dev/branches/jQueryUI/js/main.js svn-v4:e1b9dffa-5495-0410-85d9-cf58ec4b5d15::244
Dev/branches/jQueryUI/pages/mainmenu/mainmenu.html
Dev/branches/jQueryUI/pages/mainmenu/mainmenu.js
Dev/branches/jQueryUI/pages_old/applicationcreation.php svn-v4:e1b9dffa-5495-0410-85d9-cf58ec4b5d15::243
Dev/branches/jQueryUI/pages_old/createObject.php svn-v4:e1b9dffa-5495-0410-85d9-cf58ec4b5d15::243
Dev/branches/jQueryUI/pages_old/createapplication.php svn-v4:e1b9dffa-5495-0410-85d9-cf58ec4b5d15::243
Dev/branches/jQueryUI/pages_old/createsurvey.php svn-v4:e1b9dffa-5495-0410-85d9-cf58ec4b5d15::243
Dev/branches/jQueryUI/pages_old/dashboard.php svn-v4:e1b9dffa-5495-0410-85d9-cf58ec4b5d15::243
Dev/branches/jQueryUI/pages_old/database_example.php svn-v4:e1b9dffa-5495-0410-85d9-cf58ec4b5d15::243
Dev/branches/jQueryUI/pages_old/getInfo.php svn-v4:e1b9dffa-5495-0410-85d9-cf58ec4b5d15::243
Dev/branches/jQueryUI/pages_old/getObject.php svn-v4:e1b9dffa-5495-0410-85d9-cf58ec4b5d15::243
Dev/branches/jQueryUI/pages_old/logout.php svn-v4:e1b9dffa-5495-0410-85d9-cf58ec4b5d15::243
Dev/branches/jQueryUI/pages_old/mainmenu.php svn-v4:e1b9dffa-5495-0410-85d9-cf58ec4b5d15::243
Dev/branches/jQueryUI/pages_old/questionEditor.php svn-v4:e1b9dffa-5495-0410-85d9-cf58ec4b5d15::243
Dev/branches/jQueryUI/pages_old/questionEditor_old.php svn-v4:e1b9dffa-5495-0410-85d9-cf58ec4b5d15::243
Dev/branches/jQueryUI/pages_old/questioncreation.php svn-v4:e1b9dffa-5495-0410-85d9-cf58ec4b5d15::243
Dev/branches/jQueryUI/pages_old/register.php svn-v4:e1b9dffa-5495-0410-85d9-cf58ec4b5d15::243
Dev/branches/jQueryUI/pages_old/returnObjectDisplay.php svn-v4:e1b9dffa-5495-0410-85d9-cf58ec4b5d15::243
Dev/branches/jQueryUI/pages_old/saveSurvey.php svn-v4:e1b9dffa-5495-0410-85d9-cf58ec4b5d15::243
Dev/branches/jQueryUI/pages_old/savesession.php svn-v4:e1b9dffa-5495-0410-85d9-cf58ec4b5d15::243
Dev/branches/jQueryUI/pages_old/selectObject.php svn-v4:e1b9dffa-5495-0410-85d9-cf58ec4b5d15::243
Dev/branches/jQueryUI/pages_old/selectQuestion.php svn-v4:e1b9dffa-5495-0410-85d9-cf58ec4b5d15::243
Dev/branches/jQueryUI/pages_old/selectSession.php svn-v4:e1b9dffa-5495-0410-85d9-cf58ec4b5d15::243
Dev/branches/jQueryUI/pages_old/sessionEditor.php svn-v4:e1b9dffa-5495-0410-85d9-cf58ec4b5d15::243
Dev/branches/jQueryUI/pages_old/sessioncreation.php svn-v4:e1b9dffa-5495-0410-85d9-cf58ec4b5d15::243
Dev/branches/jQueryUI/pages_old/setQuestion.php svn-v4:e1b9dffa-5495-0410-85d9-cf58ec4b5d15::243
Dev/branches/jQueryUI/pages_old/submitsurvey.php svn-v4:e1b9dffa-5495-0410-85d9-cf58ec4b5d15::243
Dev/branches/jQueryUI/pages_old/survey.php svn-v4:e1b9dffa-5495-0410-85d9-cf58ec4b5d15::243
Dev/branches/jQueryUI/pages_old/surveyEditor.php svn-v4:e1b9dffa-5495-0410-85d9-cf58ec4b5d15::243
Dev/branches/jQueryUI/pages_old/surveycreation.php svn-v4:e1b9dffa-5495-0410-85d9-cf58ec4b5d15::243
Dev/branches/jQueryUI/pages_old/testpage.php svn-v4:e1b9dffa-5495-0410-85d9-cf58ec4b5d15::243
bzr:timestamp:
2012-02-07 20:17:52.227999926 +0100
bzr:user-agent:
bzr2.4.1+bzr-svn1.1.0
Message:

Created first page mainmenu in new system.
Moved old pages out of project root.
Fixed RDFAPI.php case for people with proper OS'es.

Location:
Dev/branches/jQueryUI
Files:
6 added
1 deleted
3 edited
28 moved

Legend:

Unmodified
Added
Removed

  • Dev/branches/jQueryUI/api.php

    r244 r246  
    55$rawInput = $HTTP_RAW_POST_DATA;
    66$output = array();
    7 $returnValue = 404;
     7$returnValue = 418;
    88
    99if (!empty($rawInput)) {

  • Dev/branches/jQueryUI/index.php

    r244 r246  
    88        <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
    99        <title>Facilitator</title>
    10 
    11         <link type="text/css" href="js/jquery/themes/ui-lightness/jquery-ui-1.8.17.custom.css" rel="stylesheet" />     
     10        <link type="text/css" href="js/jquery/themes/ui-lightness/jquery-ui-1.8.17.custom.css" rel="stylesheet"></link>
    1211        <script type="text/javascript" src="js/jquery/jquery-1.7.1.js"></script>
    1312        <script type="text/javascript" src="js/jquery/ui/jquery-ui-1.8.17.custom.js"></script>
     13        <script type="text/javascript" src="js/api.js"></script>
    1414        <script type="text/javascript" src="js/main.js"></script>
    1515        <?php new StyleSheet("visualeditors"); ?>
    … …  
    2727                </fieldset>
    2828            </form>
     29            <div id="info"></div>
    2930        </div>
    3031
    3132        <div id="wrapper">
    32 
    3333            <div id="content">
    34 
    35 
    36                 <div id="info" class="largeFrame">
    37                 </div>
    38                
    3934            </div>
    4035        </div>

  • Dev/branches/jQueryUI/js/main.js

    r244 r246  
    11$(function() {
     2
     3    function loadMenu() {
     4        $.get("pages/mainmenu/mainmenu.html",function(html){
     5            $("#content").html(html);
     6        });
     7        $.getScript("pages/mainmenu/mainmenu.js");
     8    }
     9
    210    $("#loginForm").dialog({
    311        buttons: {
    412            "Login": function() {
    5                 $.ajax({
    6                     type: "POST",
    7                     url: "api.php",
    8                     contentType: "application/json",
    9                     data: JSON.stringify({
    10                         action:"login",
    11                         args:{username:$("#username").val(),password:$("#password").val()}
    12                     }),
    13                     success: function(data,textStatus,jqXHR) {
    14                         $("#info").html("Succes: "+data);
     13                rft.auth.login($("#username").val(),$("#password").val(),
     14                    function(){
     15                        $("#info").html("Login succesful.");
    1516                        $("#loginForm").dialog("close");
     17                        loadMenu();
    1618                    },
    17                     error: function(jqXHR,textStatus,errorThrown) {
    18                         $("#info").html("Login Failed: "+errorThrown);
     19                    function(){
     20                        $("#info").html("Login failed.");
    1921                    }
    20                 });
     22                );
     23
     24
    2125            },
    2226            "Register": function() {
    23                 $.ajax({
    24                     type: "POST",
    25                     url: "api.php",
    26                     contentType: "application/json",
    27                     data: JSON.stringify({
    28                         action:"register",
    29                         args:{username:$("#username").val(),password:$("#password").val()}
    30                     }),
    31                     success: function(data,textStatus,jqXHR) {
    32                         $("#info").val("Succes: "+data);
     27                rft.auth.register($("#username").val(),$("#password").val(),
     28                    function(){
     29                        $("#info").val("Succesfully registered, please login now.");
    3330                    },
    34                     error: function(jqXHR,textStatus,errorThrown) {
    35                         $("#info").html("Register Failed: "+errorThrown);
     31                    function(){
     32                        $("#info").html("Register failed, username already in use.");
    3633                    }
    37                 });
     34                );
    3835            }
    3936        }
Note: See TracChangeset for help on using the changeset viewer.