Skip to content

Instantly share code, notes, and snippets.

@m0r13

m0r13/coffee_client.diff

Created July 29, 2015 10:01
Show Gist options
  • Save m0r13/2cab4c478fa5e8662cb6 to your computer and use it in GitHub Desktop.
Save m0r13/2cab4c478fa5e8662cb6 to your computer and use it in GitHub Desktop.
Download ZIP
Raw
coffee_client.diff
diff --git a/client/index.html b/client/index.html
index f7b621b..4594f65 100644
--- a/client/index.html
+++ b/client/index.html
@@ -89,14 +89,14 @@
<div class="text-muted">
<div class="pull-right">
<span ng-show="user" ng-cloak>
- <a href="/#/settings/" title="Settings" tooltip><i class="fa fa-cog fa-tablet1"></i></a>
+ <a href="/coffee/#/settings/" title="Settings" tooltip><i class="fa fa-cog fa-tablet1"></i></a>
&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;
</span>
- <a href="/admin/" target="_blank" title="Admin Interface" tooltip><i class="fa fa-magic fa-tablet1"></i></a>
+ <a href="/coffee/admin/" target="_blank" title="Admin Interface" tooltip><i class="fa fa-magic fa-tablet1"></i></a>
&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;
- <a href="/#/tablet/" ng-click="logout(false)" title="Enter tablet mode" tooltip><i class="fa fa-tablet fa-tablet1"></i></a>
+ <a href="/coffee/#/tablet/" ng-click="logout(false)" title="Enter tablet mode" tooltip><i class="fa fa-tablet fa-tablet1"></i></a>
&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;
- <a href="/#/about-us/" title="About us" tooltip><i class="fa fa-users fa-tablet1"></i></a>
+ <a href="/coffee/#/about-us/" title="About us" tooltip><i class="fa fa-users fa-tablet1"></i></a>
</div>
<div>
<a href="https://hpi.de/forschung/fachgebiete/business-process-technology.html" target="_blank">Business
diff --git a/client/js/controllers/tutorialsController.js b/client/js/controllers/tutorialsController.js
index 1b34ca8..ad65ca4 100644
--- a/client/js/controllers/tutorialsController.js
+++ b/client/js/controllers/tutorialsController.js
@@ -10,36 +10,36 @@ define(["jquery"], function (jQuery) {
function tutorialsController($scope, $rootScope, alert, service) {
$scope.images = [
/* 0 */ {
- "/public/images/tutorial-coffee/step01.jpg": function() { $scope.coffees = 1; },
- "/public/images/tutorial-coffee/step02.jpg": function() { $scope.coffees = 2; }
+ "/coffee/public/images/tutorial-coffee/step01.jpg": function() { $scope.coffees = 1; },
+ "/coffee/public/images/tutorial-coffee/step02.jpg": function() { $scope.coffees = 2; }
},
- /* 1 */ ["/public/images/tutorial-coffee/step03.jpg", "/public/images/tutorial-coffee/step04.jpg"],
- /* 2 */ "/public/images/tutorial-coffee/step05.jpg",
- /* 3 */ ["/public/images/tutorial-coffee/step06.jpg", "/public/images/tutorial-coffee/step07.jpg"],
- /* 4 */ "/public/images/tutorial-coffee/step08.jpg",
- /* 5 */ "/public/images/tutorial-coffee/step09.jpg",
- /* 6 */ "/public/images/tutorial-coffee/step10.jpg",
- /* 7 */ ["/public/images/tutorial-coffee/step12.jpg", "/public/images/tutorial-coffee/step13.jpg"],
- /* 8 */ "/public/images/tutorial-coffee/step14.jpg",
+ /* 1 */ ["/coffee/public/images/tutorial-coffee/step03.jpg", "/coffee/public/images/tutorial-coffee/step04.jpg"],
+ /* 2 */ "/coffee/public/images/tutorial-coffee/step05.jpg",
+ /* 3 */ ["/coffee/public/images/tutorial-coffee/step06.jpg", "/coffee/public/images/tutorial-coffee/step07.jpg"],
+ /* 4 */ "/coffee/public/images/tutorial-coffee/step08.jpg",
+ /* 5 */ "/coffee/public/images/tutorial-coffee/step09.jpg",
+ /* 6 */ "/coffee/public/images/tutorial-coffee/step10.jpg",
+ /* 7 */ ["/coffee/public/images/tutorial-coffee/step12.jpg", "/coffee/public/images/tutorial-coffee/step13.jpg"],
+ /* 8 */ "/coffee/public/images/tutorial-coffee/step14.jpg",
/* 9 */ {
- "/public/images/tutorial-coffee/choice-milk.png": function() { },
- "/public/images/tutorial-coffee/choice-water.png": function() { $scope.step = 16; },
- "/public/images/tutorial-coffee/choice-nothing.png": function() { $scope.step = 17; }
+ "/coffee/public/images/tutorial-coffee/choice-milk.png": function() { },
+ "/coffee/public/images/tutorial-coffee/choice-water.png": function() { $scope.step = 16; },
+ "/coffee/public/images/tutorial-coffee/choice-nothing.png": function() { $scope.step = 17; }
},
- /* 10 */ "/public/images/tutorial-coffee/step15.jpg",
- /* 11 */ "/public/images/tutorial-coffee/step16.jpg",
- /* 12 */ "/public/images/tutorial-coffee/step17.jpg",
- /* 13 */ "/public/images/tutorial-coffee/step19.jpg",
- /* 14 */ "/public/images/tutorial-coffee/step23.jpg",
- /* 15 */ {"/public/images/tutorial-coffee/step24.jpg" : function() { $scope.step = 17; }},
- /* 16 */ "/public/images/tutorial-coffee/step25.jpg",
- /* 17 */ "/public/images/tutorial-coffee/step26.jpg",
- /* 18 */ "/public/images/tutorial-coffee/step27.jpg",
- /* 19 */ "/public/images/tutorial-coffee/step28.jpg",
- /* 20 */ "/public/images/tutorial-coffee/step29.jpg",
- /* 21 */ "/public/images/tutorial-coffee/step31.jpg",
- /* 22 */ "/public/images/tutorial-coffee/step30.jpg",
- /* 23 */ "/public/images/tutorial-coffee/step22.jpg"
+ /* 10 */ "/coffee/public/images/tutorial-coffee/step15.jpg",
+ /* 11 */ "/coffee/public/images/tutorial-coffee/step16.jpg",
+ /* 12 */ "/coffee/public/images/tutorial-coffee/step17.jpg",
+ /* 13 */ "/coffee/public/images/tutorial-coffee/step19.jpg",
+ /* 14 */ "/coffee/public/images/tutorial-coffee/step23.jpg",
+ /* 15 */ {"/coffee/public/images/tutorial-coffee/step24.jpg" : function() { $scope.step = 17; }},
+ /* 16 */ "/coffee/public/images/tutorial-coffee/step25.jpg",
+ /* 17 */ "/coffee/public/images/tutorial-coffee/step26.jpg",
+ /* 18 */ "/coffee/public/images/tutorial-coffee/step27.jpg",
+ /* 19 */ "/coffee/public/images/tutorial-coffee/step28.jpg",
+ /* 20 */ "/coffee/public/images/tutorial-coffee/step29.jpg",
+ /* 21 */ "/coffee/public/images/tutorial-coffee/step31.jpg",
+ /* 22 */ "/coffee/public/images/tutorial-coffee/step30.jpg",
+ /* 23 */ "/coffee/public/images/tutorial-coffee/step22.jpg"
];
$scope.current_image = $scope.images[0];
@@ -77,4 +77,4 @@ define(["jquery"], function (jQuery) {
tutorialsController.$inject = ["$scope", "$rootScope", "seed.status", "seed.coffeeCloud"];
return tutorialsController;
-});
\ No newline at end of file
+});
diff --git a/client/js/services/coffeeCloud.js b/client/js/services/coffeeCloud.js
index 6e0dd72..096e48b 100644
--- a/client/js/services/coffeeCloud.js
+++ b/client/js/services/coffeeCloud.js
@@ -1,7 +1,7 @@
define(["jquery"], function ($) {
"use strict";
- var baseUrl = "/api/v1/";
+ var baseUrl = "/coffee/api/v1/";
var service = function($rootScope, $http) {
$http.defaults.xsrfHeaderName = "X-CSRFToken";
@@ -195,4 +195,4 @@ define(["jquery"], function ($) {
service.$inject = ["$rootScope", "$http"];
return service;
-});
\ No newline at end of file
+});
diff --git a/client/views/about-us.html b/client/views/about-us.html
index d12dc96..8bfb22d 100644
--- a/client/views/about-us.html
+++ b/client/views/about-us.html
@@ -15,5 +15,5 @@
</h3>
<a href="https://bpt.hpi.uni-potsdam.de/Public/WebHome">
- <img class="img-rounded img-header img-responsive" width="500" src="../../public/images/coffee.jpg" alt="wimi" />
+ <img class="img-rounded img-header img-responsive" width="500" src="/coffee/public/images/coffee.jpg" alt="wimi" />
</a><br>
diff --git a/client/views/welcome.html b/client/views/welcome.html
index 7d08197..05f8d04 100644
--- a/client/views/welcome.html
+++ b/client/views/welcome.html
@@ -19,7 +19,7 @@
</div>
<div class="container">
<a href="https://bpt.hpi.uni-potsdam.de/Public/WebHome">
- <img class="img-rounded img-header img-responsive" width="500" src="../../public/images/coffee.jpg" alt="wimi" />
+ <img class="img-rounded img-header img-responsive" width="500" src="/coffee/public/images/coffee.jpg" alt="wimi" />
</a><br>
<div class="caption">
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment