From 6a335845ccd2650e2444080a5faa5dc6151ab993 Mon Sep 17 00:00:00 2001 From: Karl 'vollmerk' Vollmer Date: Sun, 2 Dec 2007 00:25:07 +0000 Subject: fixed democratic play ordering along with some misc play isues with it, limited object on rightbar to 100 also started fixing the user registration, which I had forgotten about --- templates/install.css | 11 +- templates/rightbar.inc.php | 12 ++ templates/show_user_registration.inc.php | 215 ++++++++++++++----------------- 3 files changed, 116 insertions(+), 122 deletions(-) (limited to 'templates') diff --git a/templates/install.css b/templates/install.css index c9944ef4..9ee3ab13 100644 --- a/templates/install.css +++ b/templates/install.css @@ -7,6 +7,13 @@ body { background: #FFFFFF url(../images/top_bg.jpg) repeat-x top left; } +h3 { + text-align:left; + border-bottom: 1px dotted #cccccc; + padding-left: 10px; +} + + /* Header */ #header { width: 90%; @@ -103,8 +110,8 @@ margin:10px 10 10px 10px; /* Bottom */ #bottom { - border-top: 1px dotted #cccccc; - margin-top: 10px; + border-top: 1px dotted #cccccc; + margin-top: 10px; margin-bottom: 10px; padding:5px; } diff --git a/templates/rightbar.inc.php b/templates/rightbar.inc.php index 85d935c5..bf1322e1 100644 --- a/templates/rightbar.inc.php +++ b/templates/rightbar.inc.php @@ -75,6 +75,13 @@ playlist->get_items(); + + // Limit the number of objects we show here + if (count($objects) > 100) { + $truncated = (count($objects) - 100); + $objects = array_slice($objects,0,100); + } + foreach ($objects as $uid=>$object_data) { if ($object_data['1'] == 'radio' || $object_data['1'] == 'song') { $object = new $object_data['1']($object_data['0']); @@ -92,6 +99,11 @@
    • + +
  • + ... +
    • + diff --git a/templates/show_user_registration.inc.php b/templates/show_user_registration.inc.php index d150c2da..29cf8f9f 100644 --- a/templates/show_user_registration.inc.php +++ b/templates/show_user_registration.inc.php @@ -1,13 +1,13 @@ - - - - -<?php echo conf('site_title'); ?> - <?php echo $location['title']; ?> + +<?php echo Config::get('site_title'); ?> - <?php echo _('Registration'); ?> + + + + + - + + +
    - -
    -
    - - Ampache: For the love of music - -
    -
    -

    -
    - -
    - + - - - +if (Config::get('user_agreement')) { ?> +

    +
    -
    + + + + + + +
    + +
    + + print_error('user_agreement'); ?> +
    + +

    + + + + + + + + + + + + + + + + + + + + + + - + + - + - -
    + : + + * + + +
    + : + + * + +
    + : + + * + +
    + : + + * + +
    + : + + * +
    - - - - - - - - - - -
    - -
    - -
    - - print_error('user_agreement'); ?> -
    -
    + + * Required fields
    -

    - - - - - - - - - - - - - - - - - - - - - - - - - - print_error('captcha'); ?> - - - - - - - - -
    - : - - * - print_error('username'); ?> - print_error('duplicate_user'); ?> -
    - : - - * - print_error('fullname'); ?> -
    - : - - * - print_error('email'); ?> -
    - : - - * - print_error('password'); ?> -
    - : - - * -
    - *Required fields -
    - - ' /> - ' /> -
    +     		+ + ' />
    - -
    +
    +

    Ampache
    +Pour l'Amour de la Musique.

    +
    -- cgit