From bc05587ec0dc19db4edd51123a3864a813db4e30 Mon Sep 17 00:00:00 2001
From: Hagen Schink <h.schink@finn.de>
Date: Wed, 10 Dec 2014 10:49:58 +0100
Subject: [PATCH 1/2] Fix the project URL used in timelines table

---
 .../javascripts/angular/timelines/models/project.js       | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/app/assets/javascripts/angular/timelines/models/project.js b/app/assets/javascripts/angular/timelines/models/project.js
index 0868702add3..d1c739a663d 100644
--- a/app/assets/javascripts/angular/timelines/models/project.js
+++ b/app/assets/javascripts/angular/timelines/models/project.js
@@ -39,7 +39,7 @@
 
 angular.module('openproject.timelines.models')
 
-.factory('Project', [function() {
+.factory('Project', ['PathHelper', function(PathHelper) {
 
   Project = {
     objectType: 'Project',
@@ -437,12 +437,8 @@ angular.module('openproject.timelines.models')
       return this.getParent();
     },
     getUrl: function() {
-      var options = this.timeline.options;
-      var url = options.url_prefix;
+      var url = PathHelper.staticProjectPath(this.identifier);
 
-      url += options.project_prefix;
-      url += "/";
-      url += this.identifier;
       url += "/timelines";
 
       return url;

From 02bd4fee1b6f9dccf1ae34ed3d34fad3766cfb51 Mon Sep 17 00:00:00 2001
From: Hagen Schink <h.schink@finn.de>
Date: Wed, 10 Dec 2014 11:26:20 +0100
Subject: [PATCH 2/2] Fix cut off modal close icon

---
 app/assets/stylesheets/content/_modal.sass            | 5 +++++
 app/assets/stylesheets/legacy/_21_ajax_indicator.sass | 3 ---
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/app/assets/stylesheets/content/_modal.sass b/app/assets/stylesheets/content/_modal.sass
index b4c7e43868b..e840294fb50 100644
--- a/app/assets/stylesheets/content/_modal.sass
+++ b/app/assets/stylesheets/content/_modal.sass
@@ -111,3 +111,8 @@ ul.export-options
       span.export-label
         display: block
         padding: 10px 0 0 0
+
+// Legacy styles for jQuery UI modal
+
+.ui-dialog.ui-widget
+  overflow: visible
diff --git a/app/assets/stylesheets/legacy/_21_ajax_indicator.sass b/app/assets/stylesheets/legacy/_21_ajax_indicator.sass
index fc9395f5c15..edc34b23bcd 100644
--- a/app/assets/stylesheets/legacy/_21_ajax_indicator.sass
+++ b/app/assets/stylesheets/legacy/_21_ajax_indicator.sass
@@ -63,9 +63,6 @@ body
 input::-webkit-input-placeholder, :-moz-placeholder
   color: #000000
 
-.ui-dialog
-  overflow: visible
-
 #ui-dialog-closer
   background-image: image-url("modal_close.png")
   cursor: pointer