Skip to content

Commit 60f7888

Browse files
Garados007Garados007
committed
Alle Dateien, die direkt zum MarkingTool2 gehören wurden zusammengepackt und sind nun allesamt unter UI/MarkingTool2/ verfügbar. Gleichzeitig hat sich die URL im Browser geändert. Es ist nun unter /UI/MarkingTool2/?cid=*&sid=* abrufbar.
#300
1 parent e6924f0 commit 60f7888

8 files changed

Lines changed: 24 additions & 21 deletions

File tree

‎UI/MarkingTool2/.htaccess‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
RewriteEngine On
2+
RewriteRule ^$ MarkingTool2.php [QSA,L]
3+
RewriteRule ^/$ MarkingTool2.php [QSA,L]

UI/MarkingTool2.php renamed to UI/MarkingTool2/MarkingTool2.php

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
<?php
2-
include_once dirname(__FILE__) . '/include/Boilerplate.php';
3-
include_once dirname(__FILE__) . '/../Assistants/LArraySorter.php';
4-
include_once dirname(__FILE__) . '/../Assistants/Structures.php';
5-
include_once dirname(__FILE__) . '/include/FormEvaluator.php';
2+
include_once dirname(__FILE__) . '/../include/Boilerplate.php';
3+
include_once dirname(__FILE__) . '/../../Assistants/LArraySorter.php';
4+
include_once dirname(__FILE__) . '/../../Assistants/Structures.php';
5+
//include_once dirname(__FILE__) . '/../include/FormEvaluator.php';
66

77
global $globalUserData;
88
//Überprüft ob mindestens ein Tutor diese Seite abruft.
@@ -33,7 +33,7 @@
3333
// $h->bind(array('name' => $user_course_data['courses'][0]['course']['name'],
3434
// 'navigationElement' => $menu));
3535

36-
$c = Template::WithTemplateFile('include/MarkingTool2/MarkingTool2.template.html');
36+
$c = Template::WithTemplateFile('templates/MarkingTool2.template.html');
3737
$c->bind($markingTool_data);
3838
$c->bind(array(
3939
"restricted" => Authentication::checkRight(PRIVILEGE_LEVEL::LECTURER, $cid, $uid, $globalUserData),
@@ -45,8 +45,8 @@
4545

4646
$w = new HTMLWrapper(/*$h, */$c);
4747

48-
$w->set_config_file('include/configs/config_marking_tool2.json');
48+
$w->set_config_file('config_marking_tool2.json');
4949
if (isset($maintenanceMode) && $maintenanceMode === '1')
50-
$w->add_config_file('include/configs/config_maintenanceMode.json');
50+
$w->add_config_file('../include/configs/config_maintenanceMode.json');
5151
$w->show();
5252
//echo "<pre>"; echo json_encode($markingTool_data, JSON_PRETTY_PRINT); echo "</pre>";

UI/include/configs/config_marking_tool2.json renamed to UI/MarkingTool2/config_marking_tool2.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,12 @@
33
"content":"text/html",
44
"charset":"utf-8",
55
"stylesheets":[
6-
"css/CSSReset.css",
6+
"../css/CSSReset.css",
77
"css/MarkingTool2.css"
88
],
99
"javascripts":[
10-
"javascript/jquery.js",
11-
"javascript/jquery-ui.min.js",
12-
"javascript/marking_tool2_editor.js"
10+
"../javascript/jquery.js",
11+
"../javascript/jquery-ui.min.js",
12+
"js/marking_tool2_editor.js"
1313
]
1414
}

UI/css/MarkingTool2.css renamed to UI/MarkingTool2/css/MarkingTool2.css

File renamed without changes.

UI/javascript/marking_tool2_editor.js renamed to UI/MarkingTool2/js/marking_tool2_editor.js

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -569,34 +569,34 @@ MarkingTool.Editor.View = new function() {
569569
]
570570
}),
571571
hc.CreateComplexButton(
572-
hc.CreateSimpleImage("Images/Text.png"),
573-
hc.CreateSimpleImage("Images/Error.png",
572+
hc.CreateSimpleImage("../Images/Text.png"),
573+
hc.CreateSimpleImage("../Images/Error.png",
574574
task.studentComment == null || task.studentComment == "" ?
575575
{ css: [ "ui-show" ] } : undefined),
576576
hc.CreateElement("div", "S"),
577577
undefined,
578578
{ title: "Studentenkommentar" }
579579
),
580580
hc.CreateComplexButton(
581-
hc.CreateSimpleImage("Images/Text.png"),
582-
hc.CreateSimpleImage("Images/Error.png",
581+
hc.CreateSimpleImage("../Images/Text.png"),
582+
hc.CreateSimpleImage("../Images/Error.png",
583583
task.tutorComment == null || task.tutorComment == "" ?
584584
{ css: [ "ui-show" ] } : undefined),
585585
hc.CreateElement("div", "K"),
586586
undefined,
587587
{ title: "Kontrolleurkommentar" }
588588
),
589589
hc.CreateComplexButton(
590-
hc.CreateSimpleImage("Images/Download.png"),
591-
hc.CreateSimpleImage("Images/Error.png",
590+
hc.CreateSimpleImage("../Images/Download.png"),
591+
hc.CreateSimpleImage("../Images/Error.png",
592592
task.userFile == null ? { css: [ "ui-show" ] } : undefined),
593593
hc.CreateElement("div", "S"),
594594
undefined,
595595
{ title: "Studenteneinsendung" }
596596
),
597597
hc.CreateComplexButton(
598-
hc.CreateSimpleImage("Images/Download.png"),
599-
hc.CreateSimpleImage("Images/Error.png",
598+
hc.CreateSimpleImage("../Images/Download.png"),
599+
hc.CreateSimpleImage("../Images/Error.png",
600600
task.tutorFile == null ? { css: [ "ui-show" ] } : undefined),
601601
hc.CreateElement("div", "K"),
602602
undefined,

UI/include/MarkingTool2/MarkingTool2.template.html renamed to UI/MarkingTool2/templates/MarkingTool2.template.html

File renamed without changes.

‎UI/include/ExerciseSheet/ExerciseSheetLecturer.template.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -256,7 +256,7 @@
256256
</a>
257257
</li>
258258
<li>
259-
<a class="text-button" href="MarkingTool2.php?cid=<?php echo $user['courses'][0]['course']['id'],
259+
<a class="text-button" href="MarkingTool2/?cid=<?php echo $user['courses'][0]['course']['id'],
260260
'&sid=',
261261
$sheet['id']; ?>">
262262
<?php echo Language::Get('sheetMenu','markingTool2', $langTemplate); ?>

‎UI/include/ExerciseSheet/ExerciseSheetTutor.template.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -225,7 +225,7 @@
225225
</a>
226226
</li>
227227
<li>
228-
<a class="text-button" href="MarkingTool2.php?cid=<?php echo $user['courses'][0]['course']['id'],
228+
<a class="text-button" href="MarkingTool2/?cid=<?php echo $user['courses'][0]['course']['id'],
229229
'&sid=',
230230
$sheet['id']; ?>">
231231
<?php echo Language::Get('sheetMenu','markingTool2', $langTemplate); ?>

0 commit comments

Comments
 (0)