Skip to content

Commit fb2c0d3

Browse files
rluckerlucke
committed
add some changes for Stud.IP 5
1 parent 0740108 commit fb2c0d3

File tree

9 files changed

+42
-54
lines changed

9 files changed

+42
-54
lines changed

‎Unterrichtsplanung.class.php

+4-4
Original file line numberDiff line numberDiff line change
@@ -29,16 +29,16 @@ public function __construct()
2929
'Unterrichtsplanung_Admin'
3030
)
3131
) {
32-
$admin = new Navigation(_('Administration'));
32+
$admin = new Navigation(_('Unterrichtsplanung Administration'));
3333
$admin->setURL(PluginEngine::getURL('unterrichtsplanung/admin'));
3434

3535
$main->addSubNavigation('admin', $admin);
36-
Navigation::addItem('/start/unterrichtsplanung', $main);
36+
Navigation::addItem('/contents/unterrichtsplanung', $main);
3737
} else {
38-
Navigation::addItem('/start/unterrichtsplanung', $start);
38+
Navigation::addItem('/contents/unterrichtsplanung', $start);
3939
}
4040

41-
Navigation::addItem('/unterrichtsplanung', $main);
41+
Navigation::addItem('contents/unterrichtsplanung', $main);
4242

4343
PageLayout::setHelpKeyword('Basis/Unterrichtsplanung'); // Hilfeseite im Hilfewiki
4444
}

‎app/controllers/admin.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ class AdminController extends Unterrichtsplanung\Controller
44
{
55
public function index_action()
66
{
7-
Navigation::activateItem('/unterrichtsplanung/admin');
7+
Navigation::activateItem('contents/unterrichtsplanung/admin');
88
PageLayout::addStylesheet($this->plugin->getPluginURL().'/assets/css/unterrichtsplanung.css');
99
PageLayout::addStylesheet($this->plugin->getPluginURL().'/assets/css/unterrichtsplanung-admin.css');
1010
$this->body_id = 'Unterrichtsplanung-admin';

‎app/controllers/index.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ class IndexController extends Unterrichtsplanung\Controller
44
{
55
public function index_action()
66
{
7-
Navigation::activateItem('/unterrichtsplanung/index');
7+
Navigation::activateItem('contents/unterrichtsplanung/index');
88
PageLayout::addStylesheet($this->plugin->getPluginURL().'/assets/css/unterrichtsplanung.css');
99
$this->body_id = 'Unterrichtsplanung-index';
1010
// starting point for vue app

‎app/views/index/index.php

+1-5
Original file line numberDiff line numberDiff line change
@@ -1,5 +1 @@
1-
<head><link href="../../plugins_packages/elan-ev/Unterrichtsplanung/app/views/index/../../../assets/js/chunk-vendors.js" rel="preload" as="script"><link href="../../plugins_packages/elan-ev/Unterrichtsplanung/app/views/index/../../../assets/js/index.js" rel="preload" as="script"></head>
2-
<div id="app"></div>
3-
<!-- built files will be auto injected -->
4-
5-
<script type="text/javascript" src="../../plugins_packages/elan-ev/Unterrichtsplanung/app/views/index/../../../assets/js/chunk-vendors.js"></script><script type="text/javascript" src="../../plugins_packages/elan-ev/Unterrichtsplanung/app/views/index/../../../assets/js/index.js"></script>
1+
<head><link href="../../plugins_packages/elan-ev/Unterrichtsplanung/app/views/index/../../../assets/js/chunk-vendors.js" rel="preload" as="script"><link href="../../plugins_packages/elan-ev/Unterrichtsplanung/app/views/index/../../../assets/js/index.js" rel="preload" as="script"></head><div id="app"></div><script src="../../plugins_packages/elan-ev/Unterrichtsplanung/app/views/index/../../../assets/js/chunk-vendors.js"></script><script src="../../plugins_packages/elan-ev/Unterrichtsplanung/app/views/index/../../../assets/js/index.js"></script>

‎app/vue/src/AdminApp.vue

+18-10
Original file line numberDiff line numberDiff line change
@@ -5,16 +5,24 @@
55
<div class="admin-box-header">
66
<span class="headline">Infotexte bearbeiten</span>
77
<spinner :show="showSpinner" @done="showSpinner = false"/>
8-
<select @change="selectElement" v-model="selectedStructure">
9-
<option v-for="element in elementList" :key="element.text_id" :value="element.id">
10-
{{element.name}}
11-
</option>
12-
</select>
13-
<select @change="selectDidactics" v-model="selectedDiadactics">
14-
<option v-for="diadactics in diadacticsList" :key="diadactics.id" :value="diadactics.id">
15-
{{diadactics.name}}
16-
</option>
17-
</select>
8+
</div>
9+
<div class="admin-box-selects">
10+
<label>
11+
<span>Infotext</span>
12+
<select @change="selectElement" v-model="selectedStructure">
13+
<option v-for="element in elementList" :key="element.text_id" :value="element.id">
14+
{{element.name}}
15+
</option>
16+
</select>
17+
</label>
18+
<label>
19+
<span>Fachdidaktik</span>
20+
<select @change="selectDidactics" v-model="selectedDiadactics">
21+
<option v-for="diadactics in diadacticsList" :key="diadactics.id" :value="diadactics.id">
22+
{{diadactics.name}}
23+
</option>
24+
</select>
25+
</label>
1826
</div>
1927
<div class="selected-text-wrapper">
2028
<textarea v-model="selectedText" ref="selectedText" class="selected-text"/>

‎app/vue/src/App.vue

-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
<template>
22
<div id="app">
3-
<!-- <img alt="Vue logo" src="./assets/logo.png" /> -->
43
<router-view></router-view>
54
</div>
65
</template>

‎assets/css/unterrichtsplanung-admin.css

+9-13
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,3 @@
1-
/********************
2-
P A G E L A Y O U T
3-
********************/
4-
#Unterrichtsplanung-admin #layout-sidebar {
5-
display: none;
6-
}
7-
#Unterrichtsplanung-admin #page_title_container {
8-
display: none;
9-
}
10-
111
/**************
122
A D M I N B O X
133
**************/
@@ -22,6 +12,15 @@ A D M I N B O X
2212
background-color: #d4dbe5;
2313
padding: 1em;
2414
}
15+
.admin-box-selects {
16+
padding: 1em;
17+
border-left: solid thin #d4dbe5;
18+
border-right: solid thin #d4dbe5;
19+
}
20+
.admin-box-selects select{
21+
display: block;
22+
margin-bottom: 1em;
23+
}
2524
.admin-box-header span.headline {
2625
display: inline-block;
2726
vertical-align: middle;
@@ -37,9 +36,6 @@ A D M I N B O X
3736
background-position-y: center;
3837
background-size: 24px;
3938
}
40-
.admin-box-header select {
41-
float: right;
42-
}
4339
.selected-text-wrapper {
4440
border: solid thin #d4dbe5;
4541
overflow: hidden;

‎assets/css/unterrichtsplanung.css

+5-16
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,3 @@
1-
/********************
2-
P A G E L A Y O U T
3-
********************/
4-
#Unterrichtsplanung-index #layout-sidebar {
5-
display: none;
6-
}
7-
#Unterrichtsplanung-index #page_title_container {
8-
display: none;
9-
}
10-
11-
121
/********************
132
B R E A D C R U M B
143
********************/
@@ -471,7 +460,7 @@ S U M M A R Y
471460
background-image: url('../../../../../assets/images/icons/blue/zoom-in2.svg');
472461
}
473462
.overview-box.individual {
474-
background-image: url('../../../../../assets/images/icons/blue/headache.svg');
463+
background-image: url('../../../../../assets/images/icons/blue/person2.svg');
475464
background-position-y: 1.25em;
476465
}
477466
.overview-box h1{
@@ -571,7 +560,7 @@ S U M M A R Y
571560
}
572561
.toolbox-wrapper h3 {background-image: url('../../../../../assets/images/icons/blue/tools.svg');}
573562
.interdepbox-wrapper .interdep-title-type-1 {background-image: url('../img/blue/zoom-in2.svg');}
574-
.interdepbox-wrapper .interdep-title-type-2 {background-image: url('../../../../../assets/images/icons/blue/headache.svg'); background-position: 1em 0.6em;}
563+
.interdepbox-wrapper .interdep-title-type-2 {background-image: url('../../../../../assets/images/icons/blue/person2.svg'); background-position: 1em 0.6em;}
575564
.interdepbox-wrapper .interdep-title-type-3 {background-image: url('../../../../../assets/images/icons/blue/radar.svg');}
576565
.interdepbox-wrapper .interdep-title-type-4 {background-image: url('../../../../../assets/images/icons/blue/files.svg');}
577566
.interdepbox-wrapper .interdep-title-type-5 {background-image: url('../../../../../assets/images/icons/blue/admin.svg');}
@@ -606,21 +595,21 @@ S U M M A R Y
606595
.tools .toolbox-plain {background-image: url('../../../../../assets/images/icons/blue/file-text.svg');}
607596

608597
.interdeps .interdep-type-1 {background-image: url('../img/green/zoom-in2.svg');}
609-
.interdeps .interdep-type-2 {background-image: url('../../../../../assets/images/icons/green/headache.svg');}
598+
.interdeps .interdep-type-2 {background-image: url('../../../../../assets/images/icons/green/person2.svg');}
610599
.interdeps .interdep-type-3 {background-image: url('../../../../../assets/images/icons/green/radar.svg');}
611600
.interdeps .interdep-type-4 {background-image: url('../../../../../assets/images/icons/green/files.svg');}
612601
.interdeps .interdep-type-5 {background-image: url('../../../../../assets/images/icons/green/admin.svg');}
613602
.interdeps .interdep-type-6 {background-image: url('../../../../../assets/images/icons/green/computer.svg');}
614603

615604
.interdeps .interdep-pending.interdep-type-1 {background-image: url('../img/yellow/zoom-in2.svg');}
616-
.interdeps .interdep-pending.interdep-type-2 {background-image: url('../../../../../assets/images/icons/yellow/headache.svg');}
605+
.interdeps .interdep-pending.interdep-type-2 {background-image: url('../../../../../assets/images/icons/yellow/person2.svg');}
617606
.interdeps .interdep-pending.interdep-type-3 {background-image: url('../../../../../assets/images/icons/yellow/radar.svg');}
618607
.interdeps .interdep-pending.interdep-type-4 {background-image: url('../../../../../assets/images/icons/yellow/files.svg');}
619608
.interdeps .interdep-pending.interdep-type-5 {background-image: url('../../../../../assets/images/icons/yellow/admin.svg');}
620609
.interdeps .interdep-pending.interdep-type-6 {background-image: url('../../../../../assets/images/icons/yellow/computer.svg');}
621610

622611
.interdeps .interdep-disabled.interdep-type-1 {background-image: url('../img/red/zoom-in2.svg');}
623-
.interdeps .interdep-disabled.interdep-type-2 {background-image: url('../../../../../assets/images/icons/red/headache.svg');}
612+
.interdeps .interdep-disabled.interdep-type-2 {background-image: url('../../../../../assets/images/icons/red/person2.svg');}
624613
.interdeps .interdep-disabled.interdep-type-3 {background-image: url('../../../../../assets/images/icons/red/radar.svg');}
625614
.interdeps .interdep-disabled.interdep-type-4 {background-image: url('../../../../../assets/images/icons/red/files.svg');}
626615
.interdeps .interdep-disabled.interdep-type-5 {background-image: url('../../../../../assets/images/icons/red/admin.svg');}

‎plugin.manifest

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
pluginname=Unterrichtsplanung
22
pluginclassname=Unterrichtsplanung
33
origin=elan-ev
4-
version=0.1.2
5-
studipMinVersion=4.3
6-
studipMaxVersion=4.6.99
4+
version=1.0
5+
studipMinVersion=5.0
6+
studipMaxVersion=5.1.99

0 commit comments

Comments
 (0)