Merge branch 'master' of https://bitbucket.org/fsfahrttoolteam/registration-system

bf1bcaff · Tim Repke · 298483b5 · 2d15850b · bf1bcaff · bf1bcaff
Commit bf1bcaff authored 10 years ago by Tim Repke
--- a/registration-system/index.php
+++ b/registration-system/index.php
@@ -203,6 +203,9 @@ function index_check_field($index, $check, &$datarr, &$errarr, $errmess){
 function index_show_formular($fid, $bid = NULL, $bachelor = NULL){
    global $index_db, $config_studitypen, $config_essen, $config_reisearten, $invalidCharsRegEx;

+	if (!isset($_GET['noscript']))
+		echo '<noscript>';
+
    $possible_dates = comm_get_possible_dates($fid);

    if(is_null($bachelor))
@@ -241,7 +244,14 @@ function index_show_formular($fid, $bid = NULL, $bachelor = NULL){
        <button type="submit" name="submit" id="submit" value="submit">Anmelden!</button>
        <div class="spacer"></div>
        </form>
-        </div>'; 
+        </div>';
+	if (!isset($_GET['noscript']))
+	{
+		echo '</noscript>';
+		echo '<div style="margin:0 auto; position:relative; width:900px; height:500px"><div id="storybox"></div>';
+		echo '<div style="position:absolute; left:20px; bottom:20px; background:#f0f; cursor:pointer" onclick="story.next(true)">ZUR&Uuml;CK</div></div>';
+		echo '<div style="text-align:center;font-weight:bold"><a style="float:none;margin:0 auto;" href="'.$_SERVER['REQUEST_URI'].'&noscript">Seite funktioniert nicht?</a></div>';
+	}
 }

 /**

--- a/registration-system/other/drawing.svg
+++ b/registration-system/other/drawing.svg
--- a/registration-system/other/story_travelBegin.svg
+++ b/registration-system/other/story_travelBegin.svg
--- a/registration-system/view/default_index.php
+++ b/registration-system/view/default_index.php
@@ -7,7 +7,9 @@

    <link rel="stylesheet" href="view/style.css" />
    <script type="text/javascript" src="view/js/jquery-1.11.1.min.js"></script>
+    <script type="text/javascript" src="view/js/jquery-ui.min.js"></script>
    <script type="text/javascript" src="view/js/soft_protect.js"></script>
+    <script type="text/javascript" src="view/js/story.js"></script>
 </head>
 <body>
 <div id="headerbox">

--- a/registration-system/view/graphics/story/begin.png
+++ b/registration-system/view/graphics/story/begin.png
--- a/registration-system/view/graphics/story/bell.png
+++ b/registration-system/view/graphics/story/bell.png
--- a/registration-system/view/graphics/story/travelBegin.png
+++ b/registration-system/view/graphics/story/travelBegin.png
--- a/registration-system/view/js/story.js
+++ b/registration-system/view/js/story.js
+var debug = true;
+//var debug = false;
+
+var story;
+var form_variables = {};
+
+function storyImage(filename)
+{
+	return $('<img src="view/graphics/story/' + filename + '" alt="" />');
+}
+function storyImageDiv(filename)
+{
+	return $('<div style="position:absolute; width:900px; height:500px; background: url(view/graphics/story/'+filename+');"></div>');
+	addFormText(bell, "eMail", "mehl", 150, 215);
+}
+
+function addFormText(parentNode, label, fieldName, x, y)
+{
+	var form_label = $('<div>'+label+':</div>');
+	var form = $('<input name="'+fieldName+'"/>');
+	form_label.css({position:'absolute', top:y+'px',left:x+'px'});
+	form.css({position:'absolute', top:(y+20)+'px',left:x+'px'});
+	parentNode.append(form_label);
+	parentNode.append(form);
+}
+
+function Story(_storybox)
+{
+	this.storybox = _storybox;
+	this.state = 0;
+
+	this.basicData = null;
+	this.travelStart = null;
+}
+Story.prototype.next = function(bPrev)
+{
+	if (bPrev)
+	{
+		this.state -= 1;
+		if (this.state < 1)
+			this.state = 1;
+	}
+
+	switch(this.state)
+	{
+	case 0:
+		this.initBasicData();
+		break;
+	case 1:
+		this.initTravelStart();
+		this.travelStart.animate({left:bPrev?'900px':'0px'}, 1000);
+		this.basicData.animate({left:bPrev?'0px':'-900px'}, 1000);
+		break;
+	case 2:
+		break;
+	case 3:
+		break;
+	}
+	if (!bPrev)
+		this.state += 1;
+}
+Story.prototype.initTravelStart = function()
+{
+	if (this.travelStart) return;
+	this.travelStart = storyImageDiv('travelBegin.png');
+	this.travelStart.animate({left:'900px'}, 0);
+	this.storybox.append(this.travelStart);
+}
+Story.prototype.initBasicData = function()
+{
+	if (this.basicData) return;
+	this.basicData = storyImageDiv('begin.png');
+	this.storybox.append(this.basicData);
+	var bell = storyImageDiv('bell.png');
+	bell.css({position: 'relative', top: '20px', left: '20px', width: '419px', height: '438px'});
+	this.basicData.append(bell);
+	if (!debug)
+		bell.fadeOut(0);
+
+	addFormText(bell, "Vorname", "forname", 150, 60);
+	addFormText(bell, "Nachname", "name", 150, 140);
+	addFormText(bell, "Anzeigename", "anzeig", 150, 215);
+	addFormText(bell, "eMail", "mehl", 150, 290);
+	bell.append($('<div style="position:absolute;top:380px;left:120px">Bitte klingeln, wenn fertig.</div>'))
+
+	var btn_continue = $('<div style="width:60px;height:67px;position:absolute;top:48px;left:48px;cursor:pointer;" onclick="story.next();" />');
+	bell.append(btn_continue);
+	btn_continue.mouseenter(function(event) {
+		$(this).effect("highlight");
+	});
+
+	var orig_bell = $('<div style="width:3px;height:3px;position:absolute;left:633px;top:193px" />');
+	this.basicData.append(orig_bell);
+	if (!debug)
+		setTimeout(function() {
+			bell.fadeIn(1200);
+			orig_bell.effect("transfer", {to: bell}, 800);
+		}, 600);
+}
+Story.prototype.begin = function()
+{
+	this.next();
+}
+
+$(function() {
+	story = new Story($('#storybox'));
+	story.begin();
+});
--- a/registration-system/view/style.css
+++ b/registration-system/view/style.css
@@ -100,6 +100,16 @@ div.headerboxshade {
  background-color: rgba(20,20,20,0.5);
 }

+div#storybox {
+	position:absolute;
+	top:0px;
+	left:0px;
+	margin: 0 auto;
+	width:900px;
+	height:500px;
+	overflow:hidden;
+}
+
 div#headerbox h2 {
  padding-top: 10px;
  margin-left: 60px;
@@ -108,6 +118,8 @@ div#headerbox h2 {
  font-family: sans-serif;
 }

+.ui-effects-transfer { border: 2px solid black; }
+
 div#headerbox p {
  color: white;
  margin-top: 0px;