ne bissle test shit

config/layouts/default.json

@@ -17,7 +17,7 @@
     },
     "down":
     {
-      "type":"panel","name":"mensaPlan"
+      "type":"panel","name":"topListe"
     }
   }
 }

panels/mensaPlan/config.php

-<?php
-// Universal
-$MENSA_URL = "http://www.stwdo.de/gastronomie/speiseplaene/hauptmensa/wochenansicht-hauptmensa/";
-$PARSE_DAYLIST = array (
-		"montag",
-		"dienstag",
-		"mittwoch",
-		"donnerstag",
-		"freitag" 
-);
-$DO_SQL = true;
-$DO_JSON = true;
-
-// SQL
-$SQL_SERVER = "ovanier.de";
-$SQL_USER = "info_writer";
-$SQL_PW = "XAHQTZeGbqsnt8K6";
-$SQL_DB = "infoscreen";
-
-// JSON
-$JSON_NAME = "mensaPlan.json";
-$JSON_INC_NR = false;
-$JSON_INC_ORIGINAL = false;
-$JSON_INC_SHORT = true;
-$JSON_INC_ART = true;
-$JSON_INC_KIND = false;
-$JSON_INC_COUNTER = true;
-$JSON_INC_STOFFE = false;
-$JSON_INC_DATE = true;
+<?php
+// Universal
+$MENSA_URL = "http://www.stwdo.de/gastronomie/speiseplaene/hauptmensa/wochenansicht-hauptmensa/";
+$PARSE_DAYLIST = array (
+		"montag",
+		"dienstag",
+		"mittwoch",
+		"donnerstag",
+		"freitag" 
+);
+$DO_SQL = true;
+$DO_JSON = true;
+
+// SQL
+$SQL_SERVER = "ovanier.com";
+$SQL_USER = "info_writer";
+$SQL_PW = "XAHQTZeGbqsnt8K6";
+$SQL_DB = "infoscreen";
+
+// JSON
+$JSON_NAME = "mensaPlan.json";
+$JSON_INC_NR = false;
+$JSON_INC_ORIGINAL = false;
+$JSON_INC_SHORT = true;
+$JSON_INC_ART = true;
+$JSON_INC_KIND = false;
+$JSON_INC_COUNTER = true;
+$JSON_INC_STOFFE = false;
+$JSON_INC_DATE = true;
 ?>
\ No newline at end of file

panels/topListe/getTasks.php

+<?php
+
+
+?>
\ No newline at end of file

panels/topListe/script.js

 this.loaded = function(panel, config) {
-<<<<<<< HEAD
+	addElement("A");
+	addElement("B");
+	addElement("C");
+	addElement("D");
+	addElement("E");
+	//removeElement(3);
+	moveElement(3,1);
+}
 
-$(function() {
-    $( "#sortable" ).sortable();
-    $( "#sortable" ).disableSelection();
-  });
+var lastUpdates;
 
+function pull(){
+	
 }
-=======
-	var $li = $("<li class='ui-state-default'/>").text("BLA");
-    $("#sortable").append($li);
-    $("#sortable").sortable('refresh');
+
+function addElement($text){
+	var $li = $("<li class='ui-state-default'/>").text($text);
+	$("#topListSortable").append($li);
+	$("#topListSortable").sortable();
+	$("#topListSortable").disableSelection();
+	$("#topListSortable").sortable('refresh');
 }
->>>>>>> remotes/origin/dev
+
+function moveElement($idO,$idN){
+	if($idO != $idN) {
+		if($idO < $idN){
+			$("#topListSortable li:eq("+$idO+")").insertAfter($("#topListSortable li:eq("+$idN+")"));
+		} else {
+			$("#topListSortable li:eq("+$idO+")").insertBefore($("#topListSortable li:eq("+$idN+")"));
+		}
+		$("#topListSortable").sortable('refresh');
+	}
+}
+
+function removeElement($id){
+	$("#topListSortable li:eq(" + $id+")").remove();
+	$("#topListSortable").sortable('refresh');
+}
\ No newline at end of file

panels/topListe/style.less

@@ -30,13 +30,13 @@
 	font-size: 200%;
 }
 
-#topListSortable{
+#topListAnzeige{
 	float: left;
 	width: 100%;
 	height: 25%;
 }
 
-#sortable {
+#topListSortable {
 	font-weight: bold;
 	color: #ffffff;
 	list-style-type: decimal;

panels/topListe/template.html

-<<<<<<< HEAD
 <div id="topListe">
-<div id="currentTop">
-	<div id="topName">
-		TEST1
+	<div id="currentTop">
+		<div id="topName">
+			TEST1
+		</div>
+		<div id="topDescription">
+			TEST2
+		</div>
 	</div>
-	<div id="topDescription">
-	TEST2
+	<div id="topListAnzeige">
+		<ol id="topListSortable">
+		</ol>
 	</div>
 </div>
-<div id="topListSortable">
-	<ol id="sortable">
-		<li class="ui-state-default">Item 1</li>
-		<li class="ui-state-default">Item 2</li>
-		<li class="ui-state-default">Item 3</li>
-		<li class="ui-state-default">Item 4</li>
-		<li class="ui-state-default">Item 5</li>
-		<li class="ui-state-default">Item 6</li>
-		<li class="ui-state-default">Item 7</li>
-	</ol>
-</div>
-=======
-<ul id="sortable">
-  <li class="ui-state-default">Item 1</li>
-</ul>
->>>>>>> remotes/origin/dev
+