From fdfe41e3433d420bbfe643ada3e98e1d081fd78d Mon Sep 17 00:00:00 2001 From: mistic100 Date: Sat, 7 May 2011 15:55:10 +0000 Subject: merge spread_menus to the core git-svn-id: http://piwigo.org/svn/trunk@10812 68402e56-0260-453c-a942-63ccdbb3a9ee --- themes/Sylvia/theme.css | 15 ++++++++------- themes/default/local_head.tpl | 4 +++- themes/default/template/about.tpl | 7 ++----- themes/default/template/comments.tpl | 7 ++----- themes/default/template/identification.tpl | 7 ++----- themes/default/template/nbm.tpl | 8 ++------ themes/default/template/notification.tpl | 8 +++----- themes/default/template/password.tpl | 7 ++----- themes/default/template/picture.tpl | 9 +++++++++ themes/default/template/profile.tpl | 7 ++----- themes/default/template/register.tpl | 7 ++----- themes/default/template/search.tpl | 4 +--- themes/default/template/tags.tpl | 4 +--- themes/default/theme.css | 15 ++++++++++----- 14 files changed, 49 insertions(+), 60 deletions(-) (limited to 'themes') diff --git a/themes/Sylvia/theme.css b/themes/Sylvia/theme.css index 22f0ff13f..252ccf5c0 100644 --- a/themes/Sylvia/theme.css +++ b/themes/Sylvia/theme.css @@ -141,6 +141,10 @@ .content { background:#222 url(images/fillet.gif) repeat-x scroll left top; min-height:466px; + border: 1px solid #000; + border-top: 0; + margin:21px 7px 0 290px !important; + padding-top:7px; } #the_page { @@ -155,13 +159,6 @@ min-width: 100%; } -#theCategoryPage .content { - border: 1px solid #000; - border-top: 0; - margin:21px 7px 0 290px !important; - padding-top:7px; -} - .content h2 { margin:0; padding:0px 10px 15px 15px; @@ -362,6 +359,10 @@ border-top:0 !important; } +.pictureContent { + margin:0 7px 7px 290px; +} + #addComment fieldset { color: #f70; border-color: #f70; diff --git a/themes/default/local_head.tpl b/themes/default/local_head.tpl index d35ab8401..38bb4ec0e 100644 --- a/themes/default/local_head.tpl +++ b/themes/default/local_head.tpl @@ -6,4 +6,6 @@ {combine_css path="themes/default/print.css" order=-10} -{/if} \ No newline at end of file +{/if} + +{if !isset($MENUBAR)}{/if} \ No newline at end of file diff --git a/themes/default/template/about.tpl b/themes/default/template/about.tpl index 2ce658c44..f86d7bef3 100644 --- a/themes/default/template/about.tpl +++ b/themes/default/template/about.tpl @@ -1,10 +1,7 @@ +{if isset($MENUBAR)}{$MENUBAR}{/if}
- +

    {'About'|@translate}

    diff --git a/themes/default/template/comments.tpl b/themes/default/template/comments.tpl index 56f3b8a86..543a15cb8 100644 --- a/themes/default/template/comments.tpl +++ b/themes/default/template/comments.tpl @@ -1,11 +1,8 @@ +{if isset($MENUBAR)}{$MENUBAR}{/if}
    - +

      {'User comments'|@translate}

      diff --git a/themes/default/template/identification.tpl b/themes/default/template/identification.tpl index 3fcc24b50..2741e685b 100644 --- a/themes/default/template/identification.tpl +++ b/themes/default/template/identification.tpl @@ -1,11 +1,8 @@ +{if isset($MENUBAR)}{$MENUBAR}{/if}
      - +

        {'Identification'|@translate}

        diff --git a/themes/default/template/nbm.tpl b/themes/default/template/nbm.tpl index 5c40d2938..2227e1453 100644 --- a/themes/default/template/nbm.tpl +++ b/themes/default/template/nbm.tpl @@ -1,11 +1,7 @@ - +{if isset($MENUBAR)}{$MENUBAR}{/if}
        - +

          {'Notification'|@translate}

          diff --git a/themes/default/template/notification.tpl b/themes/default/template/notification.tpl index 99317a872..62a6d47cd 100644 --- a/themes/default/template/notification.tpl +++ b/themes/default/template/notification.tpl @@ -2,14 +2,12 @@ {/html_head} + +{if isset($MENUBAR)}{$MENUBAR}{/if}
          - +

            {'Notification'|@translate}

            diff --git a/themes/default/template/password.tpl b/themes/default/template/password.tpl index def94dff8..8b7390e4b 100644 --- a/themes/default/template/password.tpl +++ b/themes/default/template/password.tpl @@ -1,11 +1,8 @@ +{if isset($MENUBAR)}{$MENUBAR}{/if}
            - +

              {'Password forgotten'|@translate}

              diff --git a/themes/default/template/picture.tpl b/themes/default/template/picture.tpl index 12d020269..d029aa33d 100644 --- a/themes/default/template/picture.tpl +++ b/themes/default/template/picture.tpl @@ -2,6 +2,11 @@ {include file='include/autosize.inc.tpl'} *} +{if isset($MENUBAR)} +{$MENUBAR} +
              +{/if} + {if isset($errors)}
                @@ -310,3 +315,7 @@ y.callService( {/if}{*comments*} {if !empty($PLUGIN_PICTURE_AFTER)}{$PLUGIN_PICTURE_AFTER}{/if} + +{if isset($MENUBAR)} +
              +{/if} diff --git a/themes/default/template/profile.tpl b/themes/default/template/profile.tpl index 3a401c599..0c23b7ee1 100644 --- a/themes/default/template/profile.tpl +++ b/themes/default/template/profile.tpl @@ -1,3 +1,4 @@ +{if isset($MENUBAR)}{$MENUBAR}{/if}
              {if isset($errors)} @@ -11,11 +12,7 @@ {/if}
              - +

                {'Profile'|@translate}

                diff --git a/themes/default/template/register.tpl b/themes/default/template/register.tpl index b827c3aa0..a96200f8a 100644 --- a/themes/default/template/register.tpl +++ b/themes/default/template/register.tpl @@ -1,13 +1,10 @@ +{if isset($MENUBAR)}{$MENUBAR}{/if}
                - +

                  {'Registration'|@translate}

                  diff --git a/themes/default/template/search.tpl b/themes/default/template/search.tpl index e16e5e897..1a9a685d7 100644 --- a/themes/default/template/search.tpl +++ b/themes/default/template/search.tpl @@ -14,6 +14,7 @@ {/literal}{/footer_script} *} +{if isset($MENUBAR)}{$MENUBAR}{/if}
                  @@ -22,9 +23,6 @@
                •  {'Help'|@translate}
                  • -
                • -  {'Home'|@translate} -

                  • {'Search'|@translate}

                  diff --git a/themes/default/template/tags.tpl b/themes/default/template/tags.tpl index f6da316f3..05b739fe4 100644 --- a/themes/default/template/tags.tpl +++ b/themes/default/template/tags.tpl @@ -1,3 +1,4 @@ +{if isset($MENUBAR)}{$MENUBAR}{/if}
                  @@ -12,9 +13,6 @@  {'letters'|@translate} {/if} -
                • -  {'Home'|@translate} -

                  • {'Tags'|@translate}

                  diff --git a/themes/default/theme.css b/themes/default/theme.css index 1c7b075bb..d372d1d33 100644 --- a/themes/default/theme.css +++ b/themes/default/theme.css @@ -89,11 +89,6 @@ * Content */ .content { - margin: 1em; -} - -#theCategoryPage .content -{ margin-left: 20em; /* = #menubar width + 2em */ } @@ -411,6 +406,16 @@ TD.calDayHead { background: url('icon/rating-stars.gif') no-repeat 0 center; width:16px; } +/* only if menubar is shown */ +.pictureContent { + margin-left:20em; +} +.pictureContent #imageToolBar, +.pictureContent #theImage, +.pictureContent hr.separation { + clear:none; +} + /** * Default Layout -- cgit v1.2.3