diff options
| author | rvelices <rv-github@modusoptimus.com> | 2011-01-01 20:30:39 +0000 |
|---|---|---|
| committer | rvelices <rv-github@modusoptimus.com> | 2011-01-01 20:30:39 +0000 |
| commit | c296ca98df7745b5a7ca5bf9cd5612972f5d8e81 (patch) | |
| tree | 6b5fdff15550024c947e4392da28242e1cb0dc57 | |
| parent | 6877d368cf6a5bad4f6d5c65744e91612007d2c3 (diff) | |
- fix quick connect right margin (recent css simplification impact)
- index.php wrong nav bar generation under some plugin cases
- css sprites in the quick connect are simpler and more compact
git-svn-id: http://piwigo.org/svn/trunk@8432 68402e56-0260-453c-a942-63ccdbb3a9ee
| -rw-r--r-- | index.php | 2 | ||||
| -rw-r--r-- | themes/default/template/menubar_identification.tpl | 14 | ||||
| -rw-r--r-- | themes/default/theme.css | 6 |
3 files changed, 9 insertions, 13 deletions
@@ -63,7 +63,7 @@ if (isset($_GET['image_order'])) //-------------------------------------------------------------- initialization $page['navigation_bar'] = array(); -if (count($page['items']) > $user['nb_image_page']) +if (count($page['items']) > $page['nb_image_page']) { $page['navigation_bar'] = create_navigation_bar( duplicate_index_url(array(), array('start')), diff --git a/themes/default/template/menubar_identification.tpl b/themes/default/template/menubar_identification.tpl index 7591e7f60..0f6591508 100644 --- a/themes/default/template/menubar_identification.tpl +++ b/themes/default/template/menubar_identification.tpl @@ -48,18 +48,18 @@ {/if} <div> - <input type="hidden" name="redirect" value="{$smarty.server.REQUEST_URI|@urlencode}"> + <input type="hidden" name="redirect" value="{$smarty.server.REQUEST_URI|@urlencode}"> <input class="submit" type="submit" name="login" value="{'Submit'|@translate}"> - <ul class="categoryActions"> + <span class="categoryActions"> {if isset($U_REGISTER)} - <li><a href="{$U_REGISTER}" title="{'Create a new account'|@translate}" class="pwg-state-default pwg-button"> + <a href="{$U_REGISTER}" title="{'Create a new account'|@translate}" class="pwg-state-default pwg-button"> <span class="pwg-icon pwg-icon-register"> </span> - </a></li> + </a> {/if} - <li><a href="{$U_LOST_PASSWORD}" title="{'Forgot your password?'|@translate}" class="pwg-state-default pwg-button"> + <a href="{$U_LOST_PASSWORD}" title="{'Forgot your password?'|@translate}" class="pwg-state-default pwg-button"> <span class="pwg-icon pwg-icon-lost-password"> </span> - </a></li> - </ul> + </a> + </span> </div> </fieldset> diff --git a/themes/default/theme.css b/themes/default/theme.css index 6bfcc4daa..2de359b4f 100644 --- a/themes/default/theme.css +++ b/themes/default/theme.css @@ -64,13 +64,9 @@ } /* quickconnect form */ -#quickconnect { - margin: 5px; - padding: 0; -} #quickconnect FIELDSET { - margin: 0; + margin: 0 5px 0 0; padding: 0; /*IE6 requires padding 0*/ } |