From 85626827e8d3877698ea59ed4de3a1d0aa5e2a56 Mon Sep 17 00:00:00 2001
From: Julio Montoya <gugli100@gmail.com>
Date: Mon, 24 Jun 2013 17:05:11 +0200
Subject: [PATCH] Moving CSS to base.css

---
 main/css/base.css                    | 24 +++++++++++++++++
 main/template/default/auth/login.tpl | 40 +++-------------------------
 2 files changed, 28 insertions(+), 36 deletions(-)

diff --git a/main/css/base.css b/main/css/base.css
index 60253efae7..d6264af295 100644
--- a/main/css/base.css
+++ b/main/css/base.css
@@ -5283,5 +5283,29 @@ i.size-32.icon-new-work {
 
 .activity_content {
     margin-left:120px;
+}
 
+.form-signin {
+    max-width: 300px;
+    padding: 19px 29px 29px;
+    margin: 0 auto 20px;
+    background-color: #fff;
+    border: 1px solid #e5e5e5;
+    -webkit-border-radius: 5px;
+       -moz-border-radius: 5px;
+            border-radius: 5px;
+    -webkit-box-shadow: 0 1px 2px rgba(0,0,0,.05);
+       -moz-box-shadow: 0 1px 2px rgba(0,0,0,.05);
+            box-shadow: 0 1px 2px rgba(0,0,0,.05);
+}
+.form-signin .form-signin-heading,
+.form-signin .checkbox {
+    margin-bottom: 10px;
+}
+.form-signin input[type="text"],
+.form-signin input[type="password"] {
+    font-size: 16px;
+    height: auto;
+    margin-bottom: 15px;
+    padding: 7px 9px;
 }
diff --git a/main/template/default/auth/login.tpl b/main/template/default/auth/login.tpl
index 5379fbca62..64288ff3e4 100644
--- a/main/template/default/auth/login.tpl
+++ b/main/template/default/auth/login.tpl
@@ -1,42 +1,10 @@
 {% extends app.template_style ~ "/layout/layout_1_col.tpl" %}
 {% block content %}
-<style type="text/css">
-    body {
-    padding-top: 40px;
-    padding-bottom: 40px;
-    background-color: #f5f5f5;
-    }
-
-    .form-signin {
-    max-width: 300px;
-    padding: 19px 29px 29px;
-    margin: 0 auto 20px;
-    background-color: #fff;
-    border: 1px solid #e5e5e5;
-    -webkit-border-radius: 5px;
-       -moz-border-radius: 5px;
-            border-radius: 5px;
-    -webkit-box-shadow: 0 1px 2px rgba(0,0,0,.05);
-       -moz-box-shadow: 0 1px 2px rgba(0,0,0,.05);
-            box-shadow: 0 1px 2px rgba(0,0,0,.05);
-    }
-    .form-signin .form-signin-heading,
-    .form-signin .checkbox {
-    margin-bottom: 10px;
-    }
-    .form-signin input[type="text"],
-    .form-signin input[type="password"] {
-    font-size: 16px;
-    height: auto;
-    margin-bottom: 15px;
-    padding: 7px 9px;
-    }
-</style>
 <form class="form-signin" action="{{ url('admin_login_check') }}" method="post">
+    <h2 class="form-signin-heading">{{ 'SignIn' | get_lang }}</h2>
     {{ error }}
-    <input class="input-block-level" type="text" name="username" />
-    <input class="input-block-level" type="password" name="password" value="" />
-    <button class="btn btn-large btn-primary" type="submit">Sign in</button>
+    <input class="input-block-level" type="text" name="username" placeholder="{{ 'Username' | get_lang }}"/>
+    <input class="input-block-level" type="password" name="password" placeholder="{{ 'Password' | get_lang }}" />
+    <button class="btn btn-large btn-primary" type="submit">{{ 'LoginEnter' | get_lang }}</button>
 </form>
-
 {% endblock %}