PPM2: select

Praktikum2/ppm2/templates/index.tpl

@@ -1,3 +1,7 @@
+<<<<<<< HEAD
+=======
+<div id="idContent" class="clContent">
+>>>>>>> b2f022ec66108999eed47f8683cae851793ff6c1
   <h2 id="idContentHeader" class="clContentHeader">Module</h2>
   <div class="clContentArea">
     <ul class="clMenu" id="clMenu">
@@ -9,4 +13,9 @@
       <li><a class="clNavButton" data-action="evalLehrender">Auswertung: Lehrenden</a></li>
       <li><a class="clNavButton" data-action="evalFirmen">Auswertung: Firmen</a></li>
     </ul>
-  </div>
+<<<<<<< HEAD
+  </div>
+=======
+  </div> 
+</div>
+>>>>>>> b2f022ec66108999eed47f8683cae851793ff6c1

Praktikum2/ppm2/templates/list.tpl

@@ -1,3 +1,7 @@
+<<<<<<< HEAD
+=======
+      <div id="idContent" class="clContent">
+>>>>>>> b2f022ec66108999eed47f8683cae851793ff6c1
         <h2 id="idContentHeader" class="clContentHeader">
           &Uumlbersicht: #context['category']#
         </h2>
@@ -36,6 +40,7 @@
                   @endif@
                   </tr id=#entries#>
               @endfor@
+<<<<<<< HEAD
             @endif@
           </table>
 
@@ -44,4 +49,18 @@
           <a class="clButton" data-action="New#context['category']#">Neu</a>
           <a class="clButton" data-action="Modify#context['category']#">Bearbeiten</a>
           <a class="clButton" data-action="Delete#context['category']#">Loeschen</a>
-        </div>
+        </div>
+=======
+            @endif
+          </table>
+        </div>
+
+        <div id="idButtonArea" class="clButtonArea"> 
+          <a href="/index" class="clButton">Startseite</a>
+          <a class="clButton" id="New">Neu</a>
+          <a class="clButton" id="Modify">Bearbeiten</a>
+          <a class="clButton" id="Delete">Loeschen</a>
+        </div>
+        
+      </div>
+>>>>>>> b2f022ec66108999eed47f8683cae851793ff6c1

Praktikum2/ppm2/templates/listChoice.tpl

@@ -1,3 +1,7 @@
+<<<<<<< HEAD
+=======
+<div id="idContent" class="clContent">
+>>>>>>> b2f022ec66108999eed47f8683cae851793ff6c1
    <h2 id="idContentHeader" class="clContentHeader">
       &Uumlbersicht Praxisphasen Auswahl
    </h2>
@@ -28,6 +32,13 @@
    </div>
 
    <div id="idButtonArea" class="clButtonArea"> 
+<<<<<<< HEAD
       <a class="clButton" data-action="index">Startseite</a>
       <a class="clButton" id="Annehmen">Annehmen</a>
-   </div>
+   </div>
+=======
+      <a data-action="index" class="clButton">Startseite</a>
+      <a class="clButton" id="Annehmen">Annehmen</a>
+   </div> 
+</div>
+>>>>>>> b2f022ec66108999eed47f8683cae851793ff6c1

Praktikum2/ppm2/templates/listEval.tpl

@@ -1,9 +1,17 @@
+<<<<<<< HEAD
+=======
+      <div id="idContent" class="clContent">
+>>>>>>> b2f022ec66108999eed47f8683cae851793ff6c1
          <h2 id="idContentHeader" class="clContentHeader">
             &Uumlbersicht: #context['category']#
          </h2>
          <div id="idContentArea" class="clContentArea">
          @if context['category'] == 'Firmen'@
+<<<<<<< HEAD
             @for firmen in context@
+=======
+            @for firmen in category@
+>>>>>>> b2f022ec66108999eed47f8683cae851793ff6c1
                @if firmen != 'category'@
                   <h3>#firmen#</h3>
                   <table id="idList">
@@ -117,5 +125,11 @@
          </div>
 
          <div id="idButtonArea" class="clButtonArea"> 
+<<<<<<< HEAD
             <a class="clButton" data-action="index">Startseite</a>
-         </div> 
+         </div> 
+=======
+            <a data-action="index" class="clButton">Startseite</a>
+         </div> 
+      </div>
+>>>>>>> b2f022ec66108999eed47f8683cae851793ff6c1