Changeset 30971

Timestamp:

Feb 16, 2015, 10:02:26 AM (9 years ago)

Author:

plg

Message:

merge r30970 from trunk to branch 2.7

bug 3179 fixed: back merge r26971 (bug:2700) which introduced jBreadCrumb with this bug on Safari and not working. Maybe a future plugin instead.

Location:

branches/2.7/themes/elegant

Files:

• js (deleted)
• local_head.tpl (modified) (2 diffs)
• theme.css (modified) (1 diff)
• themeconf.inc.php (modified) (1 diff)

branches/2.7/themes/elegant/local_head.tpl

@@ -1 @@
-{html_style}
-.browsePath ul li span a:before, .browsePath ul li.last:before
-{ldelim}
-  content: "{$LEVEL_SEPARATOR}";
-}
-{/html_style}
 {footer_script}
   var p_main_menu = "{$elegant.p_main_menu}", p_pict_descr = "{$elegant.p_pict_descr}", p_pict_comment = "{$elegant.p_pict_comment}";
-  jQuery(document).ready(function() {
-      jQuery(".browsePath").jBreadCrumb();
-  });
 {/footer_script}
 {if $BODY_ID=='thePicturePage'}
@@ -16 +7 @@
         {combine_script id='elegant.scripts' load='footer' require='jquery' path='themes/elegant/scripts.js'}
 {/if}
-{combine_script id='jquery.jBreadCrumb' load='footer' require='jquery' path='themes/elegant/js/jquery.jBreadCrumb.js'}
-
-
-<!--[if lt IE 8]>
+        <!--[if lt IE 8]>
                 <link rel="stylesheet" type="text/css" href="{$ROOT_URL}themes/elegant/fix-ie7.css">
         <![endif]-->

branches/2.7/themes/elegant/theme.css

@@ -274 +274 @@
 #the_page .content .stuffs              { margin: 0!important}
 .categoryActions .theme_menuf   { display: none;}
-
-/* BreadCrumb */
-.browsePath
-{
-        margin: 0;
-        padding: 0;
-        float: left;
-        display: block;
-        height: 26px;
-        overflow: hidden;
-        width: 990px;
-        padding:5px;
-}
-.browsePath ul
-{
-        margin: 0;
-        padding: 0;
-        height: 26px;
-        display: block;
-}
-.browsePath ul li
-{
-        display: block;
-        float: left;
-        position: relative;
-        height: 26px;
-        overflow: hidden;
-        line-height: 26px;
-        margin: 0px;
-        font-size: .9167em;
-}
-.browsePath ul li a:before, .browsePath ul li.last:before
-{
-  content: "/";
-  display: inline-block;
-  margin-left: 0.2em;
-  margin-right: 0.2em;
-  text-align: center;
-  text-decoration: inherit;
-  text-transform: none;
-  width: 1em;
-}
-.browsePath ul li div.chevronOverlay
-{
-        position: absolute;
-        right: 0;
-        top: 0;
-        z-index: 2;
-}
-.browsePath ul li span
-{
-        display: block;
-        overflow: hidden;
-}
-.browsePath ul li a
-{
-        display: block;
-        position: relative;
-        height: 26px;
-        line-height: 26px;
-        overflow: hidden;
-        float: left;
-}
-.browsePath ul li.first a
-{
-        height: 26px !important;
-        text-indent:-1000em;
-        width:26px;
-        padding: 0;
-        margin: 0;
-        overflow: hidden;
-  background:url(icon/icons_sprite.png) no-repeat -26px 0;
-}
-.browsePath ul li.first a:hover
-{
-  background-image:url(icon/icons_sprite-hover.png);  
-}
-.browsePath ul li.last
-{
-        background: none;
-        margin-right: 0;
-        padding-right: 0;
-}

branches/2.7/themes/elegant/themeconf.inc.php

@@ -16 +16 @@
 global $conf;
 include(PHPWG_THEMES_PATH.'elegant/admin/upgrade.inc.php');
-add_event_handler('loc_begin_picture', 'level_separator_elegant');
-function level_separator_elegant()
-{
-  global $template;
-  $template->assign( 'LEVEL_SEPARATOR', '#&$' );
-}
+
 add_event_handler('init', 'set_config_values_elegant');
 function set_config_values_elegant()