diff options
| author | Karl 'vollmerk' Vollmer <vollmer@ampache.org> | 2006-03-20 19:12:49 +0000 |
|---|---|---|
| committer | Karl 'vollmerk' Vollmer <vollmer@ampache.org> | 2006-03-20 19:12:49 +0000 |
| commit | 5730ee7803e19265f71c479ab9175b3badd55a82 (patch) | |
| tree | 85affa3af9ba496d07b460288ab4f50e5fc094ef /templates | |
| parent | 29aa64da7da1681cd0c0cbb7cf35a3b8aeb845fd (diff) | |
| download | ampache-5730ee7803e19265f71c479ab9175b3badd55a82.tar.gz ampache-5730ee7803e19265f71c479ab9175b3badd55a82.tar.bz2 ampache-5730ee7803e19265f71c479ab9175b3badd55a82.zip | |
more catalog fun!
Diffstat (limited to 'templates')
| -rw-r--r-- | templates/basestyle.inc.php (renamed from templates/menustyle.inc) | 13 | ||||
| -rw-r--r-- | templates/header.inc | 3 | ||||
| -rw-r--r-- | templates/show_admin_catalog.inc.php | 21 | ||||
| -rw-r--r-- | templates/show_confirmation.inc.php | 4 | ||||
| -rw-r--r-- | templates/style.inc | 13 |
5 files changed, 46 insertions, 8 deletions
diff --git a/templates/menustyle.inc b/templates/basestyle.inc.php index c922ce6e..d33ab9f5 100644 --- a/templates/menustyle.inc +++ b/templates/basestyle.inc.php @@ -248,5 +248,18 @@ border-color: <?php echo conf('bg_color2'); ?>; border-bottom: 1px solid <?php echo conf('bg_color2'); ?>; } +/* Other Required Styles */ + .confirmation-box { + padding-left:5px; + padding-top:5px; + padding-right:5px; + margin-bottom:10px; + width:40em; + background-color: <?php echo conf('base_color1'); ?>; + border-right:2px solid <?php echo conf('bg_color2'); ?>; + border-bottom:2px solid <?php echo conf('bg_color2'); ?>; + border-left:2px solid <?php echo conf('bg_color2'); ?>; + border-top:2px solid <?php echo conf('bg_color2'); ?>; + } --> </style> diff --git a/templates/header.inc b/templates/header.inc index f1a2b8ed..1277c4bc 100644 --- a/templates/header.inc +++ b/templates/header.inc @@ -33,10 +33,9 @@ if (conf('use_rss')) { ?> <link rel="alternate" type="application/rss+xml" title="<?php echo conf('rss_main_title'); ?>" href="<?php echo $web_path; ?>/rss.php" /> <?php } ?> <meta http-equiv="Content-Type" content="text/html; charset=<?php echo conf('site_charset'); ?>" /> -<?php show_template('menustyle'); show_template('style'); ?> +<?php require (conf('prefix') . '/templates/basestyle.inc.php'); show_template('style'); ?> <title><?php echo conf('site_title'); ?> - <?php echo $location['title']; ?></title> </head> - <body> <script src="<?php echo $web_path; ?>/lib/general.js" language="javascript" type="text/javascript"></script> <div id="maincontainer"> diff --git a/templates/show_admin_catalog.inc.php b/templates/show_admin_catalog.inc.php index 73b9cb88..5db5f9ed 100644 --- a/templates/show_admin_catalog.inc.php +++ b/templates/show_admin_catalog.inc.php @@ -42,7 +42,7 @@ $catalogs = Catalog::get_catalogs(); <a href="<?php echo $web_path; ?>/admin/catalog.php?action=add_to_catalog&catalogs[]=<?php echo $catalog->id; ?>"> <?php echo _('Add'); ?></a> | <a href="<?php echo $web_path; ?>/admin/catalog.php?action=update_catalog&catalogs[]=<?php echo $catalog->id; ?>"> - <?php echo _('Update'); ?></a> | + <?php echo _('Verify'); ?></a> | <a href="<?php echo $web_path; ?>/admin/catalog.php?action=clean_catalog&catalogs[]=<?php echo $catalog->id; ?>"> <?php echo _('Clean'); ?></a> | <a href="<?php echo $web_path; ?>/admin/catalog.php?action=full_service&catalogs[]=<?php echo $catalog->id; ?>"> @@ -60,9 +60,22 @@ $catalogs = Catalog::get_catalogs(); </tr> <?php } // end if no catalogs ?> </table> -<form method="post" enctype="multipart/form-data" action="<?php echo $web_path; ?>/admin/catalog.php?action=full_service"> -<input class="button" type="submit" value="<?php echo _('Update Everything'); ?>" /> -</form> +<script type="text/javascript" language="javascript"> +<!-- +function ToCatalog(action) +{ + document.catalog.action = "<?php echo conf('web_path'); ?>/admin/catalog.php?action=" + action; + document.catalog.submit(); // Submit the page + return true; +} + +--> +</script> +<form name="catalog" method="post" enctype="multipart/form-data" style="Display:inline;"> +<input class="button" type="button" value="<?php echo _('Clean Everything'); ?>" onclick="return ToCatalog('clean_all_catalogs');" /> +<input class="button" type="button" value="<?php echo _('Verify Everything'); ?>" onclick="return ToCatalog('update_all_catalogs');" /> +<input class="button" type="button" value="<?php echo _('Add to Everything'); ?>" onclick="return ToCatalog('add_to_all_catalogs');" /> +<input class="button" type="button" value="<?php echo _('Update Everything'); ?>" onclick="return ToCatalog('full_service');" /> </div> <div class="text-box"> <span class="header2"><?php echo _('Other Tools'); ?></span><br /> diff --git a/templates/show_confirmation.inc.php b/templates/show_confirmation.inc.php index d561f137..07994401 100644 --- a/templates/show_confirmation.inc.php +++ b/templates/show_confirmation.inc.php @@ -19,12 +19,12 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ ?> -<div class="text-box" style="width:35em;"> +<div class="confirmation-box"> <span class="header1"><?php echo scrub_out($title); ?></span><br /> <?php echo scrub_out($text); ?> <br /><br /> [ <a href="<?php echo $path; ?>"><?php echo _('Continue'); ?></a> ] <?php if ($cancel) { ?> - [ <a href="<?php echo return_referer(); ?>"><?php echo _('Cancel'); ?></a> ]<br /> + [ <a href="<?php echo conf('web_path') . "/" . return_referer(); ?>"><?php echo _('Cancel'); ?></a> ]<br /> <?php } ?> </div> diff --git a/templates/style.inc b/templates/style.inc index bc55d541..984fe817 100644 --- a/templates/style.inc +++ b/templates/style.inc @@ -73,6 +73,19 @@ border-left:2px solid <?php echo conf('bg_color2'); ?>; border-top:2px solid <?php echo conf('bg_color2'); ?>; } + .confirmation-box + { + padding-left:5px; + padding-top:5px; + padding-right:5px; + margin-bottom:10px; + width:35em; + background-color: <?php echo conf('base_color1'); ?>; + border-right:2px solid <?php echo conf('bg_color2'); ?>; + border-bottom:2px solid <?php echo conf('bg_color2'); ?>; + border-left:2px solid <?php echo conf('bg_color2'); ?>; + border-top:2px solid <?php echo conf('bg_color2'); ?>; + } .selected_button { background-color: black;color:white; |