From c9f092616c5bfb6754cfdedf37c6f5187fe70aa5 Mon Sep 17 00:00:00 2001
From: 2deep4real <denis.peters@udo.edu>
Date: Tue, 15 Sep 2015 00:40:59 +0200
Subject: [PATCH] revert merge
---
css/design.css | 0
js/jquery.jcookie.min.js | 0
panels/clock/background.png | Bin
panels/departure/cache/.gitignore | 0
panels/departure/config/oh14.json | 36 +++++++++++++++---------------
panels/departure/departures.php | 4 ++--
panels/scrollbar/style.less | 0
7 files changed, 20 insertions(+), 20 deletions(-)
mode change 100644 => 100755 css/design.css
mode change 100644 => 100755 js/jquery.jcookie.min.js
mode change 100644 => 100755 panels/clock/background.png
mode change 100644 => 100755 panels/departure/cache/.gitignore
mode change 100644 => 100755 panels/departure/config/oh14.json
mode change 100644 => 100755 panels/departure/departures.php
mode change 100644 => 100755 panels/scrollbar/style.less
diff --git a/css/design.css b/css/design.css
old mode 100644
new mode 100755
diff --git a/js/jquery.jcookie.min.js b/js/jquery.jcookie.min.js
old mode 100644
new mode 100755
diff --git a/panels/clock/background.png b/panels/clock/background.png
old mode 100644
new mode 100755
diff --git a/panels/departure/cache/.gitignore b/panels/departure/cache/.gitignore
old mode 100644
new mode 100755
diff --git a/panels/departure/config/oh14.json b/panels/departure/config/oh14.json
old mode 100644
new mode 100755
index e6c0e2f..437e4b1
--- a/panels/departure/config/oh14.json
+++ b/panels/departure/config/oh14.json
@@ -1,18 +1,18 @@
-{
- "max":"20",
- "stops": [
- "Dortmund:Universität S",
- "Dortmund:Joseph-von-Fraunhofer Straße",
- "Dortmund:Meitnerweg"
- ],
- "filter": {
- "bl": {
- "type": [
- "H-Bahn"
- ],
- "destination" : [
- "Dortmund Otto-Hahn-Straße"
- }
- }
- }
-}
\ No newline at end of file
+{
+ "max":"20",
+ "stops": [
+ "Dortmund:Universität S",
+ "Dortmund:Joseph-von-Fraunhofer Straße",
+ "Dortmund:Meitnerweg"
+ ],
+ "filter": {
+ "bl": {
+ "type": [
+ "H-Bahn"
+ ],
+ "destination": [
+ "Dortmund Otto-Hahn-Straße"
+ ]
+ }
+ }
+}
diff --git a/panels/departure/departures.php b/panels/departure/departures.php
old mode 100644
new mode 100755
index b1d1b4c..97868a5
--- a/panels/departure/departures.php
+++ b/panels/departure/departures.php
@@ -34,7 +34,7 @@
}
if (count($options['stops']) == 0) {
$result['error'] = 'no stops defined';
- $result['config']['name'] = $_GET['config'];
+ $result['config']['name'] = $config_name;
$result['config']['type'] = 'panel/departure';
$result['options'] = $options;
echo json_encode($result);
@@ -42,7 +42,7 @@
}
} else {
$result['error'] = 'no config defined';
- $result['config']['name'] = '';
+ $result['config']['name'] = $config_name;
$result['config']['type'] = 'panel/departure';
$result['options'] = $options;
echo json_encode($result);
diff --git a/panels/scrollbar/style.less b/panels/scrollbar/style.less
old mode 100644
new mode 100755
--
GitLab