diff options
author | Einar <einargangso@gmail.com> | 2011-01-27 09:40:14 -0400 |
---|---|---|
committer | Karl Vollmer <vollmer@ampache.org> | 2011-01-27 09:40:14 -0400 |
commit | 201a61a1283c56e6cc63a8b54be72c4a57091548 (patch) | |
tree | 23e31e09396eb9d2f0c9b93d0cf91d7ac5b0513f | |
parent | 97c14fb822d929236df472493f6f571d55547248 (diff) | |
download | ampache-201a61a1283c56e6cc63a8b54be72c4a57091548.tar.gz ampache-201a61a1283c56e6cc63a8b54be72c4a57091548.tar.bz2 ampache-201a61a1283c56e6cc63a8b54be72c4a57091548.zip |
Updated html for register. Now uses the css from theme!
-rw-r--r-- | templates/show_user_registration.inc.php | 137 | ||||
-rw-r--r-- | themes/classic/templates/default.css | 85 |
2 files changed, 142 insertions, 80 deletions
diff --git a/templates/show_user_registration.inc.php b/templates/show_user_registration.inc.php index d80e5019..bac4a128 100644 --- a/templates/show_user_registration.inc.php +++ b/templates/show_user_registration.inc.php @@ -28,19 +28,19 @@ $web_path = Config::get('web_path'); <head> <meta http-equiv="Content-Type" content="text/html; charset=<?php echo Config::get('site_charset'); ?>" /> <title><?php echo Config::get('site_title'); ?> - <?php echo _('Registration'); ?></title> -<link rel="stylesheet" href="<?php echo Config::get('web_path'); ?>/templates/install.css" type="text/css" media="screen" /> +<link rel="stylesheet" href="<?php echo Config::get('web_path'); ?><?php echo Config::get('theme_path'); ?>/templates/default.css" type="text/css" media="screen" /> <link rel="shortcut icon" href="<?php echo Config::get('web_path'); ?>/favicon.ico" /> </head> -<body> -<div id="header"> -<h1><?php echo scrub_out(Config::get('site_title')); ?></h1> -<?php echo _('Registration'); ?>... -</div> +<body id="registerPage"> <script src="<?php echo $web_path; ?>/modules/prototype/prototype.js" language="javascript" type="text/javascript"></script> <script src="<?php echo $web_path; ?>/lib/javascript/base.js" language="javascript" type="text/javascript"></script> <script src="<?php echo $web_path; ?>/lib/javascript/ajax.js" language="javascript" type="text/javascript"></script> <div id="maincontainer"> +<div id="header"> +<h1><?php echo scrub_out(Config::get('site_title')); ?></h1> +<span><?php echo _('Registration'); ?>...</span> +</div> <?php $action = scrub_in($_REQUEST['action']); @@ -48,96 +48,73 @@ $fullname = scrub_in($_REQUEST['fullname']); $username = scrub_in($_REQUEST['username']); $email = scrub_in($_REQUEST['email']); ?> +<div id="registerbox"> <form name="update_user" method="post" action="<?php echo $web_path; ?>/register.php" enctype="multipart/form-data"> <?php /* If we should show the user agreement */ if (Config::get('user_agreement')) { ?> <h3><?php echo _('User Agreement'); ?></h3> -<table cellpadding="2" cellspacing="0"> -<tr> - <td> +<div class="registrationAgreement"> + <div class="agreementContent"> <?php Registration::show_agreement(); ?> - </td> -</tr> -<tr> - <td> + </div> + + <div class="agreementCheckbox"> <input type='checkbox' name='accept_agreement' /> <?php echo _('I Accept'); ?> <?php Error::display('user_agreement'); ?> - </td> -</tr> -</table> + </div> +</div> <?php } // end if(conf('user_agreement')) ?> <h3><?php echo _('User Information'); ?></h3> -<table cellpadding="0" cellspacing="0"> -<tr> - <td align='right'> - <?php echo _('Username'); ?>: - </td> - <td> - <font color='red'>*</font> <input type='text' name='username' id='username' value='<?php echo scrub_out($username); ?>' /> - <?php Error::display('username'); ?> - <?php Error::display('duplicate_user'); ?> - </td> -</tr> -<tr> - <td align='right'> - <?php echo _('Full Name'); ?>: - </td> - <td> - <font color='red'>*</font> <input type='text' name='fullname' id='fullname' value='<?php echo scrub_out($fullname); ?>' /> - <?php Error::display('fullname'); ?> - </td> -</tr> -<tr> - <td align='right'> - <?php echo _('E-mail'); ?>: - </td> - <td> - <font color='red'>*</font> <input type='text' name='email' id='email' value='<?php echo scrub_out($email); ?>' /> - <?php Error::display('email'); ?> - </td> -</tr> -<tr> - <td align='right'> - <?php echo _('Password'); ?>: - </td> - <td> - <font color='red'>*</font> <input type='password' name='password_1' id='password_1' /> - <?php Error::display('password'); ?> - </td> -</tr> -<tr> - <td align='right'> - <?php echo _('Confirm Password'); ?>: - </td> - <td> - <font color='red'>*</font> <input type='password' name='password_2' id='password_2' /> - </td> -</tr> -<tr> - <td align='center' height='20'> - <span style="color:red;"><?php echo _('* Required fields'); ?></span> - </td> - <td> </td> -</tr> -</table> +<div class="registerfield require"> + <label for="username"><?php echo _('Username'); ?>: <span class="asterix">*</span></label> + <input type='text' name='username' id='username' value='<?php echo scrub_out($username); ?>' /> + <?php Error::display('username'); ?> + <?php Error::display('duplicate_user'); ?> +</div> +<div class="registerfield require"> + <label for="fullname"><?php echo _('Full Name'); ?>: <span class="asterix">*</span></label> + <input type='text' name='fullname' id='fullname' value='<?php echo scrub_out($fullname); ?>' /> + <?php Error::display('fullname'); ?> +</div> + +<div class="registerfield require"> + <label for="email"><?php echo _('E-mail'); ?>: <span class="asterix">*</span></label> + <input type='text' name='email' id='email' value='<?php echo scrub_out($email); ?>' /> + <?php Error::display('email'); ?> +</div> + +<div class="registerfield require"> + <label for="password"><?php echo _('Password'); ?>: <span class="asterix">*</span></label> + <input type='password' name='password_1' id='password_1' /> + <?php Error::display('password'); ?> +</div> + +<div class="registerfield require"> + <label for="confirm_passord"><?php echo _('Confirm Password'); ?>: <span class="asterix">*</span></label> + <input type='password' name='password_2' id='password_2' /> +</div> + +<div class="registerInformation"> + <span><?php echo _('* Required fields'); ?></span> +</div> + <?php if (Config::get('captcha_public_reg')) { ?> <?php echo captcha::form("→ "); ?> <?php Error::display('captcha'); ?> <?php } ?> -<table> -<tr> - <td align='center' height='50'> - <input type="hidden" name="action" value="add_user" /> - <input type='submit' name='submit_registration' id='submit_registration' value='<?php echo _('Register User'); ?>' /> - </td> -</tr> -</table> + +<div class="registerButtons"> + <input type="hidden" name="action" value="add_user" /> + <input type='submit' name='submit_registration' id='submit_registration' value='<?php echo _('Register User'); ?>' /> +</div> </form> +</div><!-- end <div id="registerbox--> </div><!--end <div>id="maincontainer--> -<div id="bottom"> -<p><strong>Ampache</strong><br /> -Pour l'Amour de la Musique.</p> +<div id="footer"> + <a href="http://www.ampache.org/index.php">Ampache v.<?php echo Config::get('version'); ?></a><br /> + Copyright (c) 2001 - 2010 Ampache.org + <?php echo _('Queries:'); ?><?php echo Dba::$stats['query']; ?> <?php echo _('Cache Hits:'); ?><?php echo database_object::$cache_hit; ?> </div> </body> </html> diff --git a/themes/classic/templates/default.css b/themes/classic/templates/default.css index 0f236ff1..55d7dcae 100644 --- a/themes/classic/templates/default.css +++ b/themes/classic/templates/default.css @@ -745,6 +745,91 @@ td.lp_current a { }
/************************************************/
+/* Styles for Registration template */
+/************************************************/
+/* taken direcly from install.css */
+
+#registerPage {
+ background: #FFFFFF url(../../../images/top_bg.jpg) repeat-x top left;
+}
+
+#registerPage #header {
+ width: 90%;
+ min-height: 85px;
+ height: 85px;
+ margin: 0 auto;
+ padding: 0;
+ text-align: left;
+ font-size: smaller;
+ display: block;
+}
+
+#registerPage #header h1 {
+ margin: 0;
+ padding-top: 16px;
+ color: #000;
+ font-weight: bold;
+ font-size: large;
+}
+#registerPage h3 {
+ margin-left: 50px;
+}
+
+#registerPage input, radio, select, textarea {
+ border: 1px solid #ddd;
+ background: #f2f2f2;
+ font: 11px verdana, sans-serif;
+ color: #443;
+ padding: 2px;
+ outline: none;
+}
+#registerPage input:hover,
+textarea:hover,
+input:focus,
+textarea:focus{
+ border: 1px solid #aaa;
+}
+
+#registerPage .registerfield {
+ text-align:left;
+ margin: 1em 0;
+ margin-left: 50px;
+}
+
+#registerPage .registerfield.require .asterix {
+ color: red;
+ text-align: right;
+}
+
+#registerPage .registerfield .error {
+ font-size: 13px;
+ right: 0px;
+}
+
+#registerPage label {
+ font-weight:bold;
+ float: left;
+ width: 150px;
+ font-size: 13px;
+}
+
+#registerPage #registerbox {
+ width: 700px;
+}
+
+#registerPage .registerInformation {
+ font-size: 13px;
+ color: red;
+ margin-left: 200px;
+}
+
+#registerPage .registerButtons {
+ margin-top: 10px;
+ margin-left: 200px;
+}
+
+
+/************************************************/
/* Misc */
/************************************************/
.formValidation{
|