From f593f18131d6a0cbf30b558b208e86b9fc957f13 Mon Sep 17 00:00:00 2001 From: Karl 'vollmerk' Vollmer Date: Mon, 27 Oct 2008 09:24:34 +0000 Subject: Commit, still no internet paying for it.. curse you free.fr --- templates/base.css | 46 ++++++++++ templates/handheld.css | 106 ----------------------- templates/header.inc.php | 10 +-- templates/install.css | 6 +- templates/print.css | 6 +- templates/rightbar.inc.php | 1 + templates/show_album_row.inc.php | 1 - templates/show_artist.inc.php | 6 +- templates/show_big_art.inc.php | 2 +- templates/show_create_democratic.inc.php | 4 +- templates/show_denied.inc.php | 2 +- templates/show_disabled_songs.inc.php | 4 +- templates/show_edit_access.inc.php | 3 +- templates/show_edit_album.inc.php | 4 +- templates/show_edit_album_row.inc.php | 4 +- templates/show_edit_artist.inc.php | 2 +- templates/show_edit_artist_row.inc.php | 2 +- templates/show_edit_live_stream_row.inc.php | 10 +-- templates/show_edit_playlist_row.inc.php | 2 +- templates/show_edit_playlist_song_row.inc.php | 2 +- templates/show_edit_song.inc.php | 14 +-- templates/show_edit_song_row.inc.php | 13 ++- templates/show_genre.inc.php | 2 +- templates/show_install.inc.php | 2 +- templates/show_install_account.inc.php | 2 +- templates/show_install_config.inc.php | 2 +- templates/show_install_lang.inc.php | 2 +- templates/show_local_catalog_info.inc.php | 5 +- templates/show_localplay_add_instance.inc.php | 2 +- templates/show_localplay_edit_instance.inc.php | 2 +- templates/show_login_form.inc.php | 4 +- templates/show_manage_shoutbox.inc.php | 2 +- templates/show_object_rating.inc.php | 2 +- templates/show_play_selected.inc.php | 2 +- templates/show_playlist.inc.php | 1 - templates/show_registration_confirmation.inc.php | 6 +- templates/show_stats_newest.inc.php | 26 ++---- templates/show_stats_popular.inc.php | 7 +- templates/show_tagcloud.inc.php | 53 ------------ templates/show_test.inc.php | 11 +-- templates/show_test_config.inc.php | 8 +- templates/show_user_activate.inc.php | 10 +-- templates/show_user_registration.inc.php | 8 +- templates/show_verify_catalog.inc.php | 2 +- templates/sidebar_home.inc.php | 2 +- 45 files changed, 133 insertions(+), 280 deletions(-) create mode 100644 templates/base.css delete mode 100644 templates/handheld.css (limited to 'templates') diff --git a/templates/base.css b/templates/base.css new file mode 100644 index 00000000..17a43d97 --- /dev/null +++ b/templates/base.css @@ -0,0 +1,46 @@ +/* + + Copyright (c) Ampache.org + All rights reserved. + + This program is free software; you can redistribute it and/or + modify it under the terms of the GNU General Public License v2 + as published by the Free Software Foundation + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + +*/ +/*****************************************************************************/ +/* Base Definitions, may be overwridden by themes +/*****************************************************************************/ + +/***************** + * Tag Definitions + *****************/ +.tag_size1 { + font-size:.6em; +} +.tag_size2 { + font-size:.8em; +} +.tag_size3 { + font-size:1em; +} +.tag_size4 { + font-size:1.2em; +} + +a.tag_size1, a.tag_size2, a.tag_size3, a.tag_size4 { text-decoration: none; } + +.hover-add:hover { font-weight:900; } +.hover-remove:hover { text-decoration:line-through;} + + + diff --git a/templates/handheld.css b/templates/handheld.css deleted file mode 100644 index 5543d671..00000000 --- a/templates/handheld.css +++ /dev/null @@ -1,106 +0,0 @@ - -/* -#topbar { -display: none; -} -*/ -html, address, -blockquote, -body, dd, div, -dl, dt, fieldset, form, -frame, frameset, -h1, h2, h3, h4, -h5, h6, noframes, -ol, p, ul, center, -dir, hr, menu, pre { display: block } -li { display: list-item } -head { display: none } -table { display: block } -tr { display: table-row } -thead { display: table-header-group } -tbody { display: table-row-group } -tfoot { display: table-footer-group } -col { display: table-column } -colgroup { display: table-column-group } -td, th { display: table-cell } -caption { display: table-caption } -th { font-weight: bolder; text-align: center } -caption { text-align: center } -body { margin: 8px } -h1 { font-size: 2em; margin: .67em 0 } -h2 { font-size: 1.5em; margin: .75em 0 } -h3 { font-size: 1.17em; margin: .83em 0 } -h4, p, -blockquote, ul, -fieldset, form, -ol, dl, dir, -menu { margin: 1.12em 0 } -h5 { font-size: .83em; margin: 1.5em 0 } -h6 { font-size: .75em; margin: 1.67em 0 } -h1, h2, h3, h4, -h5, h6, b, -strong { font-weight: bolder } -blockquote { margin-left: 40px; margin-right: 40px } -i, cite, em, -var, address { font-style: italic } -pre, tt, code, -kbd, samp { font-family: monospace } -pre { white-space: pre } -textarea, -input, select { display: block } -big { font-size: 1.17em } -small, sub, sup { font-size: .83em } -sub { vertical-align: sub } -sup { vertical-align: super } -table { border-spacing: 2px; } -thead, tbody, -tfoot { vertical-align: middle } -td, th { vertical-align: inherit } -s, strike, del { text-decoration: line-through } -hr { border: 1px inset } -ol, ul, dir, -menu, dd { margin-left: 40px } -ol { list-style-type: decimal } -ol ul, ul ol, -ul ul, ol ol { margin-top: 0; margin-bottom: 0 } -u, ins { text-decoration: underline } -br:before { content: "\A" } -:before, :after { white-space: pre } -center { text-align: center } -:link, :visited { text-decoration: underline } -:focus { outline: thin dotted invert } - -/* Begin bidirectionality settings (do not change) */ -BDO[DIR="ltr"] { direction: ltr; unicode-bidi: bidi-override } -BDO[DIR="rtl"] { direction: rtl; unicode-bidi: bidi-override } - -*[DIR="ltr"] { direction: ltr; unicode-bidi: embed } -*[DIR="rtl"] { direction: rtl; unicode-bidi: embed } - -@media print { - h1 { page-break-before: always } - h1, h2, h3, - h4, h5, h6 { page-break-after: avoid } - ul, ol, dl { page-break-before: avoid } - -} diff --git a/templates/header.inc.php b/templates/header.inc.php index 2bc6d190..4caf51d5 100644 --- a/templates/header.inc.php +++ b/templates/header.inc.php @@ -33,23 +33,19 @@ $location = get_location(); - - - - - <?php echo scrub_out(Config::get('site_title')); ?> - <?php echo $location['title']; ?> + - +
-
Loading . . .
diff --git a/templates/install.css b/templates/install.css index f37431df..10eb86eb 100644 --- a/templates/install.css +++ b/templates/install.css @@ -92,7 +92,7 @@ h3 { /* Table style */ td{ padding:5px; - //background-color: #D9E0E8; + /*background-color: #D9E0E8;*/ font-size: smaller; } @@ -120,13 +120,13 @@ textarea:focus{ .ok { font-weight:bold; color:#009900; -margin:10px 10 10px 10px; +margin:10px 10px 10px 10px; } .notok { font-weight:bold; color:#FF3300; -margin:10px 10 10px 10px; +margin:10px 10px 10px 10px; } /* Bottom */ diff --git a/templates/print.css b/templates/print.css index 05027a52..b2045256 100644 --- a/templates/print.css +++ b/templates/print.css @@ -84,7 +84,7 @@ br:before { content: "\A" } :before, :after { white-space: pre } center { text-align: center } :link, :visited { text-decoration: underline } -:focus { outline: thin dotted invert } +/* :focus { outline: thin invert }*/ /* Begin bidirectionality settings (do not change) */ BDO[DIR="ltr"] { direction: ltr; unicode-bidi: bidi-override } @@ -99,6 +99,7 @@ BDO[DIR="rtl"] { direction: rtl; unicode-bidi: bidi-override } h1, h2, h3, h4, h5, h6 { page-break-after: avoid } ul, ol, dl { page-break-before: avoid } +} #sidebar { display: none; @@ -122,5 +123,4 @@ display: none; } select { display: none; -} - +} \ No newline at end of file diff --git a/templates/rightbar.inc.php b/templates/rightbar.inc.php index fab81de3..22bc74e6 100644 --- a/templates/rightbar.inc.php +++ b/templates/rightbar.inc.php @@ -32,6 +32,7 @@ id); + Playlist::build_cache($playlists); foreach ($playlists as $playlist_id) { $playlist = new Playlist($playlist_id); $playlist->format(); diff --git a/templates/show_album_row.inc.php b/templates/show_album_row.inc.php index 734bacb1..fd712364 100644 --- a/templates/show_album_row.inc.php +++ b/templates/show_album_row.inc.php @@ -44,7 +44,6 @@ - id,'add_tag',_('Add Tag'),'add_album_tag_' . $album->id); ?> diff --git a/templates/show_artist.inc.php b/templates/show_artist.inc.php index 62a54076..2f29d11a 100644 --- a/templates/show_artist.inc.php +++ b/templates/show_artist.inc.php @@ -25,7 +25,7 @@ $title = sprintf(_('Albums by %s'), $artist->full_name); show_box_top(sprintf(gettext('%s by %s'), ucfirst($object_type) ,$artist->f_name),'info-box'); if (Config::get('ratings')) { ?> -
id); ?>"_artist" style="display:inline;"> +
id, 'artist'); ?>
@@ -38,7 +38,7 @@ if (Config::get('ratings')) { id,'add',_('Add'),'add_' . $artist->id); ?>f_name); ?>
  • - id,'random',_('Random'),'random_' . $artist->id); ?>f_name); ?>> + id,'random',_('Random'),'random_' . $artist->id); ?>f_name); ?>
  • @@ -53,7 +53,7 @@ if (Config::get('ratings')) {
  • /> - +
    • diff --git a/templates/show_big_art.inc.php b/templates/show_big_art.inc.php index 4121fff3..eb9ba0c4 100644 --- a/templates/show_big_art.inc.php +++ b/templates/show_big_art.inc.php @@ -28,7 +28,7 @@ $htmllang = str_replace("_","-",Config::get('lang')); <?php echo Config::get('site_title'); ?> - <?php echo _("Album Art"); ?> - + "; echo "\"\""; diff --git a/templates/show_create_democratic.inc.php b/templates/show_create_democratic.inc.php index 7059cebe..3175da2b 100644 --- a/templates/show_create_democratic.inc.php +++ b/templates/show_create_democratic.inc.php @@ -24,7 +24,7 @@ show_box_top(_('Create Democratic Playlist')); ?> - + @@ -32,7 +32,7 @@ show_box_top(_('Create Democratic Playlist')); ?> - + diff --git a/templates/show_denied.inc.php b/templates/show_denied.inc.php index 1b59cf08..74afe4ef 100644 --- a/templates/show_denied.inc.php +++ b/templates/show_denied.inc.php @@ -25,9 +25,9 @@ Ampache -- Debug Page + - - @@ -53,7 +53,7 @@ - diff --git a/templates/show_edit_access.inc.php b/templates/show_edit_access.inc.php index 14848946..9aa6c25e 100644 --- a/templates/show_edit_access.inc.php +++ b/templates/show_edit_access.inc.php @@ -24,7 +24,7 @@
    +
    +
    - + @@ -65,7 +65,6 @@ - diff --git a/templates/show_edit_album_row.inc.php b/templates/show_edit_album_row.inc.php index c6168972..e1a1a694 100644 --- a/templates/show_edit_album_row.inc.php +++ b/templates/show_edit_album_row.inc.php @@ -24,7 +24,7 @@
    :
    :
    : diff --git a/templates/show_edit_album.inc.php b/templates/show_edit_album.inc.php index e8f30373..41e6ccb7 100644 --- a/templates/show_edit_album.inc.php +++ b/templates/show_edit_album.inc.php @@ -26,13 +26,13 @@
    - +
    - +
    diff --git a/templates/show_edit_artist_row.inc.php b/templates/show_edit_artist_row.inc.php index 9e8ec913..de4c16b2 100644 --- a/templates/show_edit_artist_row.inc.php +++ b/templates/show_edit_artist_row.inc.php @@ -24,7 +24,7 @@
    - + - + diff --git a/templates/show_edit_artist.inc.php b/templates/show_edit_artist.inc.php index 50e256c8..030466a2 100644 --- a/templates/show_edit_artist.inc.php +++ b/templates/show_edit_artist.inc.php @@ -26,7 +26,7 @@
    - +
    - +
    - + diff --git a/templates/show_edit_live_stream_row.inc.php b/templates/show_edit_live_stream_row.inc.php index 475a2e78..48284165 100644 --- a/templates/show_edit_live_stream_row.inc.php +++ b/templates/show_edit_live_stream_row.inc.php @@ -32,19 +32,19 @@
    - + - + - + - + - + diff --git a/templates/show_edit_playlist_row.inc.php b/templates/show_edit_playlist_row.inc.php index 3a1e6161..ce752772 100644 --- a/templates/show_edit_playlist_row.inc.php +++ b/templates/show_edit_playlist_row.inc.php @@ -24,7 +24,7 @@ diff --git a/templates/show_genre.inc.php b/templates/show_genre.inc.php index 630aab61..6e1ee56f 100644 --- a/templates/show_genre.inc.php +++ b/templates/show_genre.inc.php @@ -26,7 +26,7 @@ */ $web_path = Config::get('web_path'); ?> -name)); ?> +name)); ?> [get_album_count(); ?>]
    diff --git a/templates/show_install.inc.php b/templates/show_install.inc.php index b42b6769..799ba65b 100644 --- a/templates/show_install.inc.php +++ b/templates/show_install.inc.php @@ -25,7 +25,7 @@ if (INSTALL != '1') { exit; } Ampache :: For The Love Of Music - Install - + diff --git a/templates/show_install_account.inc.php b/templates/show_install_account.inc.php index 1e6991d3..9c52b93e 100644 --- a/templates/show_install_account.inc.php +++ b/templates/show_install_account.inc.php @@ -26,7 +26,7 @@ if (INSTALL != '1') { exit; } Ampache :: For The Love Of Music - Install - +
    - + type; ${$name} = ' selected="selected"'; ?> diff --git a/templates/show_edit_playlist_song_row.inc.php b/templates/show_edit_playlist_song_row.inc.php index 8a8d612c..fec8c24a 100644 --- a/templates/show_edit_playlist_song_row.inc.php +++ b/templates/show_edit_playlist_song_row.inc.php @@ -24,7 +24,7 @@ diff --git a/templates/show_edit_song.inc.php b/templates/show_edit_song.inc.php index 028d2933..ee2dde80 100644 --- a/templates/show_edit_song.inc.php +++ b/templates/show_edit_song.inc.php @@ -30,7 +30,7 @@ @@ -38,7 +38,7 @@ @@ -46,7 +46,7 @@ @@ -54,25 +54,25 @@ diff --git a/templates/show_edit_song_row.inc.php b/templates/show_edit_song_row.inc.php index 97eb47b1..f8cdc36c 100644 --- a/templates/show_edit_song_row.inc.php +++ b/templates/show_edit_song_row.inc.php @@ -1,7 +1,7 @@
    - + f_link; ?> f_artist_link; ?>
    - +
    album); ?>

    - +
    artist); ?>

    - +
    genre); ?>

    - +
    - +
    - +
    - +
    + - +
    - + artist,true,$song->id); ?> @@ -36,18 +37,14 @@ id,'change','check_inline_song_edit("album", '.$song->id.')'); ?> - genre,'',true,$song->id); ?> -
    -id,'change','check_inline_song_edit("genre", '.$song->id.')'); ?> -    		 - + id . '&type=song','download',_('Save Changes'),'save_song_' . $song->id,'edit_song_' . $song->id); ?>
    @@ -44,4 +44,3 @@
    - diff --git a/templates/show_localplay_add_instance.inc.php b/templates/show_localplay_add_instance.inc.php index 224994c7..68d83f22 100644 --- a/templates/show_localplay_add_instance.inc.php +++ b/templates/show_localplay_add_instance.inc.php @@ -27,7 +27,7 @@ $field) { ?>
    diff --git a/templates/show_localplay_edit_instance.inc.php b/templates/show_localplay_edit_instance.inc.php index 49a34d5c..6f3f8d70 100644 --- a/templates/show_localplay_edit_instance.inc.php +++ b/templates/show_localplay_edit_instance.inc.php @@ -26,7 +26,7 @@ $field) { ?> - + diff --git a/templates/show_login_form.inc.php b/templates/show_login_form.inc.php index a5fd3499..44b58be5 100644 --- a/templates/show_login_form.inc.php +++ b/templates/show_login_form.inc.php @@ -55,11 +55,11 @@ function focus(){ document.login.username.focus(); }
    - +
    - +
    get_items(); Browse::set_type('playlist_song'); Browse::add_supplemental_object('playlist',$playlist->id); Browse::set_static_content(1); diff --git a/templates/show_registration_confirmation.inc.php b/templates/show_registration_confirmation.inc.php index 55cb78db..21b30c9a 100644 --- a/templates/show_registration_confirmation.inc.php +++ b/templates/show_registration_confirmation.inc.php @@ -27,16 +27,14 @@ $web_path = Config::get('web_path'); <?php echo Config::get('site_title'); ?> - <?php echo _('Registration'); ?> - - + + - - diff --git a/templates/show_stats_newest.inc.php b/templates/show_stats_newest.inc.php index 04489b2b..0bd0bb66 100644 --- a/templates/show_stats_newest.inc.php +++ b/templates/show_stats_newest.inc.php @@ -19,23 +19,9 @@ */ ?> -
    - _('Newest Albums')); - show_box_top('','info-box box_newest_albums'); - require Config::get('prefix') . '/templates/show_objects.inc.php'; - show_box_bottom(); - $objects = Stats::get_newest('artist'); - $headers = array('f_name_link'=>_('Newest Artists')); - show_box_top('','info-box box_newest_artists'); - require Config::get('prefix') . '/templates/show_objects.inc.php'; - show_box_bottom(); - $objects = Stats::get_newest('genre'); - $headers = array('f_link'=>_('Newest Genres')); - show_box_top('','info-box box_newest_genres'); - require Config::get('prefix') . '/templates/show_objects.inc.php'; - show_box_bottom(); - ?> -
    - + + + + + + diff --git a/templates/show_stats_popular.inc.php b/templates/show_stats_popular.inc.php index 648945a9..432f971f 100644 --- a/templates/show_stats_popular.inc.php +++ b/templates/show_stats_popular.inc.php @@ -1,7 +1,7 @@ _('Most Popular Genres')); - show_box_top('','info-box box_popular_genres'); - require Config::get('prefix') . '/templates/show_objects.inc.php'; - show_box_bottom(); ?>
    diff --git a/templates/show_tagcloud.inc.php b/templates/show_tagcloud.inc.php index 882246db..bde48898 100644 --- a/templates/show_tagcloud.inc.php +++ b/templates/show_tagcloud.inc.php @@ -21,56 +21,3 @@ */ $web_path = Config::get('web_path'); ?> -name -$tagbyid = array(); -foreach ($tagcloudList as $f) - $tagbyid[$f['id']] = $f; -$ar = $_GET; -unset($ar['tag']); -$base = rebuild_query($ar); -$currentTags = array_fill_keys($_SESSION['browse']['filter']['tag'], '1'); -$filter=0; -foreach ($_SESSION['browse']['filter']['tag'] as $t) { - if (!$filter) { - $filter = 1; - echo _('Filters(remove): '); - } - $ctags = $currentTags; - unset($ctags[$t]); - $stags = implode(',', array_keys($ctags)); - $col = 'black'; - $alt = ''; - if (isset($tagbyid[$t]['color'])) { - $col = $tagbyid[$t]['color']; - $alt = ' title="owner: '. $tagbyid[$t]['username'].'" '; - } - echo ''.$tagbyid[$t]['name'].' '; -} -echo '
    '; -$filter = 0; -foreach ($tagcloudList as $f) { - $n = $f['name']; - $id = $f['id']; - if (!$currentTags[$id]) { - if (!$filter) { - $filter = 1; - echo _('Matching tags: '); - } - $ctags = $currentTags; - $ctags[$id] = 1; - $stags = implode(',', array_keys($ctags)); - $col = 'black'; - $alt = ''; - if (isset($f['color'])) { - $col = $f['color']; - $alt = ' title="owner: '. $f['username'].'" '; - } - echo ''.$n.' '; - } -} -*/ -?> - diff --git a/templates/show_test.inc.php b/templates/show_test.inc.php index 43338288..5c193f98 100644 --- a/templates/show_test.inc.php +++ b/templates/show_test.inc.php @@ -25,13 +25,14 @@ Ampache -- Debug Page + - +
    @@ -246,7 +247,7 @@ } $results['web_path'] = $http_type . $_SERVER['SERVER_NAME'] . ":" . $_SERVER['SERVER_PORT'] . Config::get('web_path'); if ($status['parse_config']) { - echo ""; + echo "      "; } else { $status['check_webpath'] = false; @@ -257,15 +258,15 @@ ]
    - This test makes sure that your web_path variable is set correctly and that we are able to get to the index page. If you do not see the ampache - logo here then your web_path is not set correctly. + This test makes sure that your web_path variable is set correctly and that we are able to get to the index page. If you do not see a check mark + here then your web_path is not set correctly.

    Ampache Debug.
    -For the love of Music.

    +Pour l'Amour de la Musique.

    diff --git a/templates/show_test_config.inc.php b/templates/show_test_config.inc.php index 085fa17c..9c1807b0 100644 --- a/templates/show_test_config.inc.php +++ b/templates/show_test_config.inc.php @@ -25,8 +25,6 @@ Ampache -- Config Debug Page - - + +

    Ampache Debug.
    -For the love of Music.

    +Pour l'Amour de la Musique.

    diff --git a/templates/show_user_activate.inc.php b/templates/show_user_activate.inc.php index 99e8796f..4b5b6cc0 100644 --- a/templates/show_user_activate.inc.php +++ b/templates/show_user_activate.inc.php @@ -27,16 +27,15 @@ $web_path = Config::get('web_path'); <?php echo Config::get('site_title'); ?> - <?php echo _('Registration'); ?> - - + + - - + @@ -48,7 +47,8 @@ $web_path = Config::get('web_path'); ?>

    - ', ''); ?> + ', ''); ?>

    diff --git a/templates/show_user_registration.inc.php b/templates/show_user_registration.inc.php index c435293d..f162c6c6 100644 --- a/templates/show_user_registration.inc.php +++ b/templates/show_user_registration.inc.php @@ -27,16 +27,14 @@ $web_path = Config::get('web_path'); <?php echo Config::get('site_title'); ?> - <?php echo _('Registration'); ?> - - + + - - @@ -62,7 +60,7 @@ if (Config::get('user_agreement')) { ?> - + diff --git a/templates/show_verify_catalog.inc.php b/templates/show_verify_catalog.inc.php index 22a37af3..a915d681 100644 --- a/templates/show_verify_catalog.inc.php +++ b/templates/show_verify_catalog.inc.php @@ -20,7 +20,7 @@ */ show_box_top(); -printf(_('Updating the %s catalog', "[ $catalog->name ]")); +printf(_('Updating the %s catalog'), "[ $catalog->name ]"); echo "
    \n" . $number . " " . _('songs found checking tag information.') . "
    \n\n"; echo _('Verifed') . ":$catalog_verify_found
    "; echo _('Reading') . ":$catalog_verify_directory
    "; diff --git a/templates/sidebar_home.inc.php b/templates/sidebar_home.inc.php index 114cb256..ec37677b 100644 --- a/templates/sidebar_home.inc.php +++ b/templates/sidebar_home.inc.php @@ -43,7 +43,7 @@ $ajax_info = Config::get('ajax_url'); $web_path = Config::get('web_path'); - + -- cgit