From b42f8b35e309ca4f96450cb8f2b80d398085280c Mon Sep 17 00:00:00 2001
From: Timo Haberkern <Timo.Haberkern@shift-up.de>
Date: Tue, 30 Nov 2010 09:53:24 +0100
Subject: [PATCH] Fixing Problem with RememberMe-Filter, smaller CSS
 improvement

---
 apps/frontend/lib/myUser.class.php                 | 6 +++---
 lib/de/shiftup/timeboxx/RememberMeFilter.class.php | 8 --------
 lib/model/doctrine/ProjectTable.class.php          | 2 --
 web/css/themes/black.css                           | 2 ++
 web/css/themes/blue.css                            | 2 ++
 web/css/themes/brown.css                           | 2 ++
 web/css/themes/green.css                           | 2 ++
 web/css/themes/orange.css                          | 2 ++
 web/css/themes/purple.css                          | 2 ++
 web/css/themes/red.css                             | 2 ++
 10 files changed, 17 insertions(+), 13 deletions(-)

diff --git a/apps/frontend/lib/myUser.class.php b/apps/frontend/lib/myUser.class.php
index edc0861..16e50b2 100644
--- a/apps/frontend/lib/myUser.class.php
+++ b/apps/frontend/lib/myUser.class.php
@@ -60,15 +60,15 @@ public function signIn(User $user)
         $this->setAttribute('username', $user->getUsername());
         $this->setAttribute('firstname', $user->getFirstName());
         $this->setAttribute('lastname', $user->getLastName());
-        $this->setAttribute('theme', $user->Setting->theme);
+        //$this->setAttribute('theme', $user->Setting->theme);
 
         if ($user->administrator == true) {
             $this->addCredential('admin');
         }
 
-        if ($user->Setting->culture != "") {
+        /*if ($user->Setting->culture != "") {
             $this->setCulture($user->Setting->culture);
-        }
+        }*/
     }
 
     private $is_first_request = true;
diff --git a/lib/de/shiftup/timeboxx/RememberMeFilter.class.php b/lib/de/shiftup/timeboxx/RememberMeFilter.class.php
index 8e4b542..475974a 100644
--- a/lib/de/shiftup/timeboxx/RememberMeFilter.class.php
+++ b/lib/de/shiftup/timeboxx/RememberMeFilter.class.php
@@ -2,7 +2,6 @@
 
 class RememberMeFilter extends sfFilter
 {
-
     /**
      * @see sfFilter
      */
@@ -21,18 +20,11 @@ public function execute($filterChain)
                     sfContext::getInstance()->getLogger()->info('load user');
                     $user = Doctrine::getTable('User')->find($token->user_id);
 
-
                     $this->context->getUser()->signIn($user);
                 }
             }
-
-            if ($this->context->getUser()->isAnonymous()) {
-                $settings = Doctrine::getTable('Settings')->find(1);
-                $this->context->getUser()->setCulture($settings->default_language);
-            }
         }
 
         $filterChain->execute();
     }
-
 }
\ No newline at end of file
diff --git a/lib/model/doctrine/ProjectTable.class.php b/lib/model/doctrine/ProjectTable.class.php
index ee9d868..de22de5 100644
--- a/lib/model/doctrine/ProjectTable.class.php
+++ b/lib/model/doctrine/ProjectTable.class.php
@@ -1,6 +1,4 @@
 <?php
-
-
 class ProjectTable extends Doctrine_Table
 {
     
diff --git a/web/css/themes/black.css b/web/css/themes/black.css
index b9a065f..2d8b729 100644
--- a/web/css/themes/black.css
+++ b/web/css/themes/black.css
@@ -201,6 +201,8 @@ form.basic dl dd {float: left;}
 form.basic dl dt {padding: 3px 5px 3px 0; width: 20%;}
 form.basic dl dd {padding: 3px 0 3px 5px; width: 76%;}
 
+label { margin-right: 4px }
+
 label.check,
 label.radio {margin-right: 5px;}
 form small {color: #999;}
diff --git a/web/css/themes/blue.css b/web/css/themes/blue.css
index 0593d00..1a98046 100644
--- a/web/css/themes/blue.css
+++ b/web/css/themes/blue.css
@@ -201,6 +201,8 @@ form.basic dl dd {float: left;}
 form.basic dl dt {padding: 3px 5px 3px 0; width: 20%;}
 form.basic dl dd {padding: 3px 0 3px 5px; width: 76%;}
 
+label { margin-right: 4px }
+
 label.check,
 label.radio {margin-right: 5px;}
 form small {color: #999;}
diff --git a/web/css/themes/brown.css b/web/css/themes/brown.css
index a79629c..d59e230 100644
--- a/web/css/themes/brown.css
+++ b/web/css/themes/brown.css
@@ -201,6 +201,8 @@ form.basic dl dd {float: left;}
 form.basic dl dt {padding: 3px 5px 3px 0; width: 20%;}
 form.basic dl dd {padding: 3px 0 3px 5px; width: 76%;}
 
+label { margin-right: 4px }
+
 label.check,
 label.radio {margin-right: 5px;}
 form small {color: #999;}
diff --git a/web/css/themes/green.css b/web/css/themes/green.css
index d230809..fc3b3e1 100644
--- a/web/css/themes/green.css
+++ b/web/css/themes/green.css
@@ -202,6 +202,8 @@ form.basic dl dd {float: left;}
 form.basic dl dt {padding: 3px 5px 3px 0; width: 20%;}
 form.basic dl dd {padding: 3px 0 3px 5px; width: 76%;}
 
+label { margin-right: 4px }
+
 label.check,
 label.radio {margin-right: 5px;}
 form small {color: #999;}
diff --git a/web/css/themes/orange.css b/web/css/themes/orange.css
index e195f3a..883ddca 100644
--- a/web/css/themes/orange.css
+++ b/web/css/themes/orange.css
@@ -202,6 +202,8 @@ form.basic dl dd {float: left;}
 form.basic dl dt {padding: 3px 5px 3px 0; width: 20%;}
 form.basic dl dd {padding: 3px 0 3px 5px; width: 76%;}
 
+label { margin-right: 4px }
+
 label.check,
 label.radio {margin-right: 5px;}
 form small {color: #999;}
diff --git a/web/css/themes/purple.css b/web/css/themes/purple.css
index 5531995..fe0ae1f 100644
--- a/web/css/themes/purple.css
+++ b/web/css/themes/purple.css
@@ -202,6 +202,8 @@ form.basic dl dd {float: left;}
 form.basic dl dt {padding: 3px 5px 3px 0; width: 20%;}
 form.basic dl dd {padding: 3px 0 3px 5px; width: 76%;}
 
+label { margin-right: 4px }
+
 label.check,
 label.radio {margin-right: 5px;}
 form small {color: #999;}
diff --git a/web/css/themes/red.css b/web/css/themes/red.css
index 581fea4..1a165a5 100644
--- a/web/css/themes/red.css
+++ b/web/css/themes/red.css
@@ -202,6 +202,8 @@ form.basic dl dd {float: left;}
 form.basic dl dt {padding: 3px 5px 3px 0; width: 20%;}
 form.basic dl dd {padding: 3px 0 3px 5px; width: 76%;}
 
+label { margin-right: 4px }
+
 label.check,
 label.radio {margin-right: 5px;}
 form small {color: #999;}