From 25dbbfc15596e7fe792ffe33e231f74694367530 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Martin=20M=C3=BCller?= <mueller@miconware.de>
Date: Wed, 7 May 2014 11:24:31 +0200
Subject: [PATCH] weiterleitung

---
 app/Controller/JobController.php |  4 ++--
 app/webroot/css/dreamjob.css     |  9 ++++++++-
 app/webroot/js/dreamjob.js       | 14 +++++++++++---
 3 files changed, 21 insertions(+), 6 deletions(-)

diff --git a/app/Controller/JobController.php b/app/Controller/JobController.php
index 5b85fc4..bb22bfd 100644
--- a/app/Controller/JobController.php
+++ b/app/Controller/JobController.php
@@ -54,7 +54,7 @@ class JobController extends AppController {
                 $this->DreamjobJobOpening->data['DreamjobJobOpening']['company_id'] = $c['AppUser']['id'];
                 if ($this->DreamjobJobOpening->save()) {
                     $this->MiconwareSession->setFlash(__('dreamjob.opening.save.add'), 'flash', array('alert' => 'success'));
-                    return $this->redirect(array('action' => 'applicationByOpening','id'=>$this->DreamjobJobOpening->id));
+                    return $this->redirect(array('action' => 'openingGet','id'=>$this->DreamjobJobOpening->id));
                 } else {
                     $this->MiconwareSession->setFlash(__('dreamjob.opening.save.error'), 'flash', array('alert' => 'danger'));
                 }
@@ -92,7 +92,7 @@ class JobController extends AppController {
                     $this->DreamjobJobOpening->data['DreamjobJobOpening']['company_id'] = $cid;
                     if ($this->DreamjobJobOpening->save($this->DreamjobJobOpening->data)) {
                         $this->MiconwareSession->setFlash(__('dreamjob.opening.save'), 'flash', array('alert' => 'success'));
-                        return $this->redirect(array('action' => 'applicationByOpening','id'=>$this->request->params['id']));
+                        return $this->redirect(array('action' => 'openingGet','id'=>$this->request->params['id']));
                     } else
                         $this->MiconwareSession->setFlash(__('dreamjob.opening.save.error'), 'flash', array('alert' => 'danger'));
                 }
diff --git a/app/webroot/css/dreamjob.css b/app/webroot/css/dreamjob.css
index 771cc90..743deb6 100755
--- a/app/webroot/css/dreamjob.css
+++ b/app/webroot/css/dreamjob.css
@@ -159,7 +159,14 @@ body.loading #container{
     color:white;
     text-decoration: none;
 }
-
+/*
+ *
+ */
+#alert.old .alert{
+    background-color: #E9E9E9;
+    border-color: #BABABA;
+    color: #9B9B9B;
+}
 /*
  * Main
  */
diff --git a/app/webroot/js/dreamjob.js b/app/webroot/js/dreamjob.js
index e9a4563..0b53ab3 100755
--- a/app/webroot/js/dreamjob.js
+++ b/app/webroot/js/dreamjob.js
@@ -144,14 +144,17 @@
 			});
 			//$(where+" form label.has-error").parent(".form-group").addClass("has-error")
         }
-        function setContent(data,back,tab){
+        function setContent(data,back,tab,backignore){
                 alert = data.split('<!-- alert -->')[1].split('<!-- /alert -->')[0];
+                $('#alert').removeClass('old');
                 if( alert.trim().length > 0){
                     $('#alert').html(alert);
+                }else if(!backignore){
+                    $('#alert').addClass('old');
                 }
                 
                 if(back){
-                    load(back,{},tab);
+                    load(back,{'backignore':true},tab);
                 }else if(tab){
                     navbar = data.split('<!-- tab -->')[1].split('<!-- /tab -->')[0];
                     $('#tab').html(navbar);
@@ -182,6 +185,7 @@
                 alert = "<div class=\"alert alert-danger\">"+data.statusText+
                         "<button type=\"button\" class=\"close\" data-dismiss=\"alert\">&times;</button>"
                         + "</div>";
+                $('#alert').removeClass('old');
                 $('#alert').html(alert);
                 event("#alert");
                     $('#container').html(data.responseText);
@@ -191,6 +195,7 @@
             data = {};
             typemethode = "GET";
             back = false;
+            backignore = false;
             history = true;
             if(conf['data'])
                 data = conf['data'];
@@ -198,14 +203,17 @@
                 typemethode = conf['type'];
             if(conf['back'] && conf['back'].indexOf("logout")== -1 && conf['back'].indexOf("login")== -1 )
                 back = conf['back'];
+            if(conf['backignore'])
+                backignore = conf['backignore'];
             if(conf['history'])
                 history = conf['history'];
+            
             //e.preventDefault(); 
             /*	
             if uncomment the above line, html5 nonsupported browers won't change the url but will display the ajax content;
             if commented, html5 nonsupported browers will reload the page to the specified link. 
             */	
-            $.ajax({url:pageurl,data:data,type:typemethode,success:function(data){setContent(data,back,tab);} ,error:function(data){setContentError(data,back,tab);}});
+            $.ajax({url:pageurl,data:data,type:typemethode,success:function(data){setContent(data,back,tab,backignore);} ,error:function(data){setContentError(data,back,tab);}});
             if(history && pageurl!=window.location){
                     window.history.pushState({path:pageurl},'',pageurl);	
             }