Author: Jonathan.Wage
Date: 2010-01-20 04:40:11 +0100 (Wed, 20 Jan 2010)
New Revision: 26908
Removed:
plugins/sfSympalPlugin/trunk/lib/plugins/sfSympalUserPlugin/modules/sympal_auth/templates/_signin_form.php
Modified:
plugins/sfSympalPlugin/trunk/lib/plugins/sfSympalAdminPlugin/modules/sympal_admin/config/security.yml
plugins/sfSympalPlugin/trunk/lib/plugins/sfSympalAdminPlugin/modules/sympal_admin/lib/Basesympal_adminActions.class.php
plugins/sfSympalPlugin/trunk/lib/plugins/sfSympalAdminPlugin/modules/sympal_admin/templates/signinSuccess.php
plugins/sfSympalPlugin/trunk/lib/plugins/sfSympalAdminPlugin/web/css/admin.css
plugins/sfSympalPlugin/trunk/lib/plugins/sfSympalUserPlugin/modules/sympal_auth/templates/signinSuccess.php
plugins/sfSympalPlugin/trunk/lib/sfSympalConfiguration.class.php
plugins/sfSympalPlugin/trunk/web/css/sympal.css
Log:
[1.4][sfSympalPlugin][1.0] Fixing admin signin
Modified:
plugins/sfSympalPlugin/trunk/lib/plugins/sfSympalAdminPlugin/modules/sympal_admin/config/security.yml
===================================================================
---
plugins/sfSympalPlugin/trunk/lib/plugins/sfSympalAdminPlugin/modules/sympal_admin/config/security.yml
2010-01-20 02:52:27 UTC (rev 26907)
+++
plugins/sfSympalPlugin/trunk/lib/plugins/sfSympalAdminPlugin/modules/sympal_admin/config/security.yml
2010-01-20 03:40:11 UTC (rev 26908)
@@ -1,5 +1,2 @@
all:
- is_secure: true
-
-signin:
- is_secure: false
\ No newline at end of file
+ is_secure: true
\ No newline at end of file
Modified:
plugins/sfSympalPlugin/trunk/lib/plugins/sfSympalAdminPlugin/modules/sympal_admin/lib/Basesympal_adminActions.class.php
===================================================================
---
plugins/sfSympalPlugin/trunk/lib/plugins/sfSympalAdminPlugin/modules/sympal_admin/lib/Basesympal_adminActions.class.php
2010-01-20 02:52:27 UTC (rev 26907)
+++
plugins/sfSympalPlugin/trunk/lib/plugins/sfSympalAdminPlugin/modules/sympal_admin/lib/Basesympal_adminActions.class.php
2010-01-20 03:40:11 UTC (rev 26908)
@@ -25,6 +25,8 @@
return $this->redirect('@sympal_dashboard');
}
+ $this->getResponse()->setTitle('Sympal Admin / Signin');
+
$class = sfConfig::get('app_sf_guard_plugin_signin_form',
'sfGuardFormSignin');
$this->form = new $class();
Modified:
plugins/sfSympalPlugin/trunk/lib/plugins/sfSympalAdminPlugin/modules/sympal_admin/templates/signinSuccess.php
===================================================================
---
plugins/sfSympalPlugin/trunk/lib/plugins/sfSympalAdminPlugin/modules/sympal_admin/templates/signinSuccess.php
2010-01-20 02:52:27 UTC (rev 26907)
+++
plugins/sfSympalPlugin/trunk/lib/plugins/sfSympalAdminPlugin/modules/sympal_admin/templates/signinSuccess.php
2010-01-20 03:40:11 UTC (rev 26908)
@@ -1,17 +1,22 @@
-<div id="sympal_admin_signin">
+<?php use_helper('I18N') ?>
+
+<div id="sympal_signin">
+ <h1>Signin</h1>
+
<?php use_helper('I18N') ?>
<form action="<?php echo url_for('@sympal_admin') ?>" method="post">
- <div id="sf_admin_container">
- <h1>Sympal Admin Signin</h1>
-
- <div id="sf_admin_signin">
- <div class="sf_admin_form">
- <?php echo get_partial('sympal_default/render_form', array('form' =>
$form)) ?>
-
- <input type="submit" value="<?php echo __('Signin', null,
'sf_guard') ?>" />
- </div>
- </div>
- </div>
+ <table>
+ <tbody>
+ <?php echo $form ?>
+ </tbody>
+ <tfoot>
+ <tr>
+ <td colspan="2">
+ <input type="submit" value="<?php echo __('Signin', null,
'sf_guard') ?>" />
+ </td>
+ </tr>
+ </tfoot>
+ </table>
</form>
</div>
\ No newline at end of file
Modified:
plugins/sfSympalPlugin/trunk/lib/plugins/sfSympalAdminPlugin/web/css/admin.css
===================================================================
---
plugins/sfSympalPlugin/trunk/lib/plugins/sfSympalAdminPlugin/web/css/admin.css
2010-01-20 02:52:27 UTC (rev 26907)
+++
plugins/sfSympalPlugin/trunk/lib/plugins/sfSympalAdminPlugin/web/css/admin.css
2010-01-20 03:40:11 UTC (rev 26908)
@@ -294,10 +294,6 @@
font-weight: bold;
}
-#sympal_admin_signin {
-
-}
-
#sympal_server_check table {
background: #375fc2;
-khtml-border-radius:0.4em;
@@ -321,8 +317,27 @@
label.required:after
{
- content:'*';
+ content: '*';
+ margin-left: 20px;
color: red;
float: right;
font-weight: bold;
+}
+
+#sympal_signin {
+ padding: 16px;
+ background: #333;
+ border: 1px solid #000;
+ width: 500px;
+ margin: auto;
+ color: #fff;
+ -khtml-border-radius: 0.75em;
+ -moz-border-radius: 0.75em;
+ -webkit-border-radius: 0.75em;
+ border-radius: 0.75em;
+ text-align: left;
+}
+
+#sympal_signin h1 {
+ font-size: 24px;
}
\ No newline at end of file
Modified:
plugins/sfSympalPlugin/trunk/lib/plugins/sfSympalUserPlugin/modules/sympal_auth/templates/signinSuccess.php
===================================================================
---
plugins/sfSympalPlugin/trunk/lib/plugins/sfSympalUserPlugin/modules/sympal_auth/templates/signinSuccess.php
2010-01-20 02:52:27 UTC (rev 26907)
+++
plugins/sfSympalPlugin/trunk/lib/plugins/sfSympalUserPlugin/modules/sympal_auth/templates/signinSuccess.php
2010-01-20 03:40:11 UTC (rev 26908)
@@ -1,5 +1,7 @@
<?php use_helper('I18N') ?>
-<h1>Signin</h1>
+<div id="sympal_signin">
+ <h1>Signin</h1>
-<?php echo get_partial('sfGuardAuth/signin_form', array('form' => $form)) ?>
\ No newline at end of file
+ <?php echo get_partial('sfGuardAuth/signin_form', array('form' => $form)) ?>
+</div>
\ No newline at end of file
Modified: plugins/sfSympalPlugin/trunk/lib/sfSympalConfiguration.class.php
===================================================================
--- plugins/sfSympalPlugin/trunk/lib/sfSympalConfiguration.class.php
2010-01-20 02:52:27 UTC (rev 26907)
+++ plugins/sfSympalPlugin/trunk/lib/sfSympalConfiguration.class.php
2010-01-20 03:40:11 UTC (rev 26908)
@@ -111,6 +111,11 @@
$this->_projectConfiguration->loadHelpers(array(
'Sympal', 'SympalContentSlot', 'SympalMenu', 'SympalPager', 'I18N',
'Asset'
));
+
+ if ($this->isAdminModule())
+ {
+ sfConfig::set('sf_login_module', 'sympal_admin');
+ }
}
public function filterTemplateParameters(sfEvent $event, $parameters)
Modified: plugins/sfSympalPlugin/trunk/web/css/sympal.css
===================================================================
--- plugins/sfSympalPlugin/trunk/web/css/sympal.css 2010-01-20 02:52:27 UTC
(rev 26907)
+++ plugins/sfSympalPlugin/trunk/web/css/sympal.css 2010-01-20 03:40:11 UTC
(rev 26908)
@@ -541,5 +541,6 @@
content:'*';
color: red;
float: right;
+ margin-left: 20px;
font-weight: bold;
}
\ No newline at end of file
--
You received this message because you are subscribed to the Google Groups
"symfony SVN" group.
To post to this group, send email to [email protected].
To unsubscribe from this group, send email to
[email protected].
For more options, visit this group at
http://groups.google.com/group/symfony-svn?hl=en.
