darthsandmann/WEB
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Revert "PPM2: select"

Browse Source 
This reverts commit 552b7cc942
This commit is contained in:
darthsandmann
2016-12-12 23:04:04 +01:00
parent 552b7cc942
commit 8060d7af68
10 changed files with 5 additions and 340 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
Praktikum2/ppm2/static/html/index.html
View File

@@ -18,21 +18,6 @@
<a title="Zur&uumlck zur Startseite">Praxisphasenmanager (PPM)</a>
</h1>
<div id="idContent" class="clContent">
<<<<<<< HEAD
=======
<h2 id="idContentHeader" class="clContentHeader">Module</h2>
<div class="clContentArea">
<ul class="clMenu" id="clMenu">
<li><a class="clNavButton" data-action="categoryStudenten">Datenpflege: Studenten</a></li>
<li><a class="clNavButton" data-action="categoryLehrender">Datenpflege: Lehrender</a></li>
<li><a class="clNavButton" data-action="categoryFirmen">Datenpflege: Firmenverzeichnis</a></li>
<li><a class="clNavButton" data-action="choice">Auswahl: Praxisphasen</a></li>
<li><a class="clNavButton" data-action="evalStudenten">Auswertung: Studenten</a></li>
<li><a class="clNavButton" data-action="evalLehrender">Auswertung: Lehrenden</a></li>
<li><a class="clNavButton" data-action="evalFirmen">Auswertung: Firmen</a></li>
</ul>
</div>
>>>>>>> b2f022ec66108999eed47f8683cae851793ff6c1
</div>
</body>
<footer>