Changeset 9596


Ignore:
Timestamp:
03/10/11 11:12:40 (9 years ago)
Author:
plg
Message:

feature 2217: switch upgrade screen to a clear background theme

Location:
trunk
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/admin/themes/default/template/upgrade.tpl

    r6363 r9596  
    88<link rel="shortcut icon" type="image/x-icon" href="{$ROOT_URL}{$themeconf.icon_dir}/favicon.ico"> 
    99 
     10{get_combined_css} 
    1011{foreach from=$themes item=theme} 
    11 {if isset($theme.local_head)}{include file=$theme.local_head}{/if} 
    12 <link rel="stylesheet" type="text/css" href="{$ROOT_URL}admin/themes/{$theme.id}/theme.css"> 
     12{if $theme.load_css} 
     13{combine_css path="admin/themes/`$theme.id`/theme.css" order=-10} 
     14{/if} 
    1315{/foreach} 
     16 
     17<!--[if IE 7]> 
     18  <link rel="stylesheet" type="text/css" href="{$ROOT_URL}admin/themes/default/fix-ie7.css"> 
     19<![endif]--> 
     20 
     21<!-- BEGIN get_combined_scripts --> 
     22{get_combined_scripts load='header'} 
     23<!-- END get_combined_scripts --> 
    1424 
    1525{literal} 
    1626<style type="text/css"> 
    1727body { 
    18   background:url("admin/themes/roma/images/bottom-left-bg.jpg") no-repeat fixed left bottom #111111; 
     28  font-size:12px; 
    1929} 
    2030 
    2131.content { 
    22   background:url("admin/themes/roma/images/fillet.png") repeat-x scroll left top #222222; 
    23   width: 800px; 
    24   min-height: 0px !important; 
    25   margin: auto; 
    26   text-align: left; 
    27   padding: 5px; 
    28 } 
    29  
    30 #headbranch { 
    31   background:url("admin/themes/roma/images/top-left-bg.jpg") no-repeat scroll left top transparent; 
     32 width: 800px; 
     33 margin: auto; 
     34 text-align: center; 
     35 padding:0; 
     36 background-color:transparent !important; 
     37 border:none; 
     38} 
     39 
     40#content { 
     41  min-height:0; 
    3242} 
    3343 
    3444#theHeader { 
    3545  display: block; 
    36   background:url("admin/themes/roma/images/piwigo_logo_sombre_214x100.png") no-repeat scroll 245px top transparent; 
     46  background:url("admin/themes/clear/images/piwigo_logo_big.png") no-repeat scroll center 20px transparent; 
     47  height:100px; 
     48} 
     49 
     50fieldset { 
     51  margin-top:20px; 
     52  background-color:#f1f1f1; 
     53} 
     54 
     55legend { 
     56  font-weight:bold; 
     57  letter-spacing:2px; 
     58} 
     59 
     60form fieldset p { 
     61  text-align:left; 
     62  margin:10px; 
    3763} 
    3864 
    3965.content h2 { 
    4066  display:block; 
    41   font-size:28px; 
    42   height:104px; 
    43   width:54%; 
    44   color:#666666; 
    45   letter-spacing:-1px; 
    46   margin:0 30px 3px 20px; 
    47   overflow:hidden; 
    48   position:absolute; 
    49   right:0; 
    50   text-align:right; 
    51   top:0; 
    52   width:770px; 
    53   text-align:right; 
    54   text-transform:none;  
    55 } 
    56  
    57 table { margin: 0px; } 
    58 td {  padding: 3px 10px; } 
    59 textarea { margin-left: 20px; } 
     67  font-size:20px; 
     68  text-align:center; 
     69  /* margin-top:5px; */ 
     70} 
     71 
     72table.table2 { 
     73  width: 100%; 
     74  border:0; 
     75} 
     76 
     77table.table2 td { 
     78  text-align: left; 
     79  padding: 5px 2px; 
     80} 
     81 
     82table.table2 td.fieldname { 
     83  font-weight:normal; 
     84} 
     85 
     86table.table2 td.fielddesc { 
     87  padding-left:10px; 
     88  font-style:italic; 
     89} 
     90 
     91input[type="submit"], input[type="button"], a.bigButton { 
     92  font-size:14px; 
     93  font-weight:bold; 
     94  letter-spacing:2px; 
     95  border:none; 
     96  background-color:#666666; 
     97  color:#fff; 
     98  padding:5px; 
     99  -moz-border-radius:5px; 
     100} 
     101 
     102input[type="submit"]:hover, input[type="button"]:hover, a.bigButton:hover { 
     103  background-color:#ff7700; 
     104  color:white; 
     105} 
     106 
     107input[type="text"], input[type="password"], select { 
     108  background-color:#ddd; 
     109  border:2px solid #ccc; 
     110  -moz-border-radius:5px; 
     111  padding:2px; 
     112} 
     113 
     114input[type="text"]:focus, input[type="password"]:focus, select:focus { 
     115  background-color:#fff; 
     116  border:2px solid #ff7700; 
     117} 
     118 
     119.sql_content, .infos a { 
     120  color: #ff3363; 
     121} 
     122 
     123.errors { 
     124  padding-bottom:5px; 
     125} 
     126 
    60127</style> 
    61128{/literal} 
     
    64131 
    65132<body> 
    66 <div id="headbranch"></div> {* Dummy block for double background management *} 
    67133<div id="the_page"> 
    68134<div id="theHeader"></div> 
     
    70136 
    71137{if isset($introduction)} 
    72 <h2>Piwigo {$RELEASE} - {'Upgrade'|@translate}</h2> 
     138<h2>{'Version'|@translate} {$RELEASE} - {'Upgrade'|@translate}</h2> 
    73139 
    74140{if isset($errors)} 
     
    82148{/if} 
    83149 
     150<form method="POST" action="{$introduction.F_ACTION}" name="upgrade_form"> 
     151 
     152<fieldset> 
    84153<table> 
    85154  <tr> 
     
    98167{/if} 
    99168 
    100 <form method="POST" action="{$introduction.F_ACTION}" name="upgrade_form"> 
    101169{if isset($login)} 
    102170<table> 
     
    111179</table> 
    112180{/if} 
    113  
     181</fieldset> 
    114182<p style="text-align: center;"> 
    115183<input class="submit" type="submit" name="submit" value="{'Upgrade from version %s to %s'|@translate|@sprintf:$introduction.CURRENT_RELEASE:$RELEASE}"> 
     
    127195<h2>{'Upgrade from version %s to %s'|@translate|@sprintf:$upgrade.VERSION:$RELEASE}</h2> 
    128196 
    129 <p><b>{'Statistics'|@translate}</b></p> 
     197<fieldset> 
     198<legend>{'Statistics'|@translate}</legend> 
    130199<ul> 
    131200  <li>{'total upgrade time'|@translate} : {$upgrade.TOTAL_TIME}</li> 
     
    133202  <li>{'SQL queries'|@translate} : {$upgrade.NB_QUERIES}</li> 
    134203</ul> 
    135  
    136 <p><b>{'Upgrade informations'|@translate}</b></p> 
     204</fieldset> 
     205 
     206<fieldset> 
     207<legend>{'Upgrade informations'|@translate}</legend> 
    137208<ul> 
    138209  {foreach from=$infos item=info} 
     
    140211  {/foreach} 
    141212</ul> 
    142  
    143 <form action="index.php" method="post"> 
    144 <p><input type="submit" name="submit" value="{'Home'|@translate}"></p> 
    145 </form> 
     213</fieldset> 
     214 
     215<p> 
     216  <a class="bigButton" href="index.php">{'Home'|@translate}</a> 
     217</p> 
    146218{/if} 
    147219 
  • trunk/upgrade.php

    r9595 r9596  
    230230 
    231231include( PHPWG_ROOT_PATH .'include/template.class.php'); 
    232 $template = new Template(PHPWG_ROOT_PATH.'admin/themes', 'roma'); 
     232$template = new Template(PHPWG_ROOT_PATH.'admin/themes', 'clear'); 
    233233$template->set_filenames(array('upgrade'=>'upgrade.tpl')); 
    234234$template->assign(array( 
Note: See TracChangeset for help on using the changeset viewer.