69. Araxis Merge File Comparison Report

Produced by Araxis Merge on Fri Dec 13 16:40:55 2019 UTC. See www.araxis.com for information about Merge. This report uses XHTML and CSS2, and is best viewed with a reasonably standards compliant browser such as the latest version of Firefox or Internet Explorer. For optimum results when printing this report, use landscape orientation and enable printing of background images and colours in your browser.

69.1 Files compared

# Location File Last Modified
1 Fri Dec 13 16:40:55 2019 UTC
2 Porto v.3.2.2\Theme Files\Magento 1.x\Porto Theme\app\design\frontend\smartwave\porto\template\page\html header_type26.phtml Mon Nov 25 16:44:12 2019 UTC

69.2 Comparison summary

Description Between
Files 1 and 2
Text Blocks Lines
Unchanged 0 0
Changed 0 0
Inserted 1 113
Removed 0 0

69.3 Comparison options

Whitespace All differences in whitespace within lines are ignored
Character case Differences in character case are significant
Line endings Differences in line endings (CR and LF characters) are ignored
CR/LF characters Not shown in the comparison detail

69.4 Active regular expressions

No regular expressions were active.

69.5 Comparison detail

        1   <?php echo  $this->ge tChildHtml ('sticky.n av') ?>
        2   <?php
        3       $store  = Mage::a pp()->getS tore();
        4       $code   = $store- >getCode() ;
        5       $custo m_block =  Mage::getS toreConfig ('porto_se ttings/hea der/static _block', $ code);
        6   ?>
        7   <div class ="header-c ontainer t ype26 head er-newskin ">
        8       <div c lass="top- links-cont ainer">
        9           <d iv class=" top-links  container" >
        10                <div cla ss="top-li nks-inner" >
        11                    <?ph p
        12                    $sto re_currenc y = $this- >getChildH tml('store _currency' );
        13                    $sto re_languag e = $this- >getChildH tml('store _language' );
        14                    ?>
        15                    <?ph p echo $st ore_curren cy; ?>
        16                    <?ph p if($stor e_currency  && $store _language) :?>
        17                         <span clas s="split"> </span>
        18                    <?ph p endif; ? >
        19                    <?ph p echo $st ore_langua ge; ?>
        20                    <?ph p if($stor e_currency  || $store _language) :?>
        21                         <span clas s="split"> </span>
        22                    <?ph p endif; ? >
        23                    <?ph p
        24                         $compare_l ink = $thi s->getChil dHtml('com pare_link' );
        25                    ?>
        26                    <?ph p echo $co mpare_link ; ?>
        27                    <div  class="to p-links-ar ea">
        28                         <div class ="top-link s-icon"><a  href="jav ascript:vo id(0)"><?p hp echo $t his->__("l inks"); ?> </a></div>
        29                         <?php echo  $this->ge tChildHtml ('topLinks '); ?>
        30                    </di v>
        31                    <p c lass="welc ome-msg">< ?php echo  $this->get ChildHtml( 'welcome') ; ?> <?php  echo $thi s->getAddi tionalHtml (); ?></p>
        32                    <div  class="cl earer"></d iv>
        33                </div>
        34           </ div>
        35       </div>
        36       <div c lass="head er contain er">
        37           <d iv class=" header-mai n-left">
        38                <?php ec ho '<div c lass="cust om-block"> '.$this->g etLayout() ->createBl ock('cms/b lock')->se tBlockId($ custom_blo ck)->toHtm l().'</div >'; ?>
        39           </ div>
        40           <d iv class=" header-mai n-center">
        41                <div cla ss="menu-i con"><a hr ef="javasc ript:void( 0)" title= "<?php ech o $this->_ _('Menu');  ?>"><i cl ass="fa fa -bars"></i ></a></div >
        42                <?php if  ($this->g etIsHomePa ge()):?>
        43                <h1 clas s="logo">< strong><?p hp echo $t his->getLo goAlt(); ? ></strong> <a href="< ?php echo  $this->get Url(''); ? >" title=" <?php echo  $this->ge tLogoAlt() ; ?>" clas s="logo">< img src="< ?php echo  $this->get LogoSrc();  ?>" alt=" <?php echo  $this->ge tLogoAlt() ; ?>" /></ a></h1>
        44                <?php el se:?>
        45                <a href= "<?php ech o $this->g etUrl('');  ?>" title ="<?php ec ho $this-> getLogoAlt (); ?>" cl ass="logo" ><strong>< ?php echo  $this->get LogoAlt();  ?></stron g><img src ="<?php ec ho $this-> getLogoSrc (); ?>" al t="<?php e cho $this- >getLogoAl t(); ?>" / ></a>
        46                <?php en dif; ?>
        47           </ div>
        48           <d iv class=" header-mai n-right">
        49                <?php
        50                    $cus tom_block_ 2 = Mage:: getStoreCo nfig('port o_settings /header/st atic_block _26', $cod e);
        51                ?>
        52                <?php ec ho '<div c lass="cust om-block"> '.$this->g etLayout() ->createBl ock('cms/b lock')->se tBlockId($ custom_blo ck_2)->toH tml().'</d iv>'; ?>
        53                <div cla ss="search -area">
        54                    <a h ref="javas cript:void (0);" clas s="search- icon"><i c lass="icon -magnifier "></i><spa n><?php ec ho $this-> __('Search '); ?></a>
        55                </div>
        56                <div cla ss="wishli st-link">
        57                    <a h ref="<?php  echo $thi s->getUrl( 'wishlist' ); ?>" tit le="<?php  echo $this ->__('Wish list'); ?> "><i class ="porto-ne w-icon-wis hlist-2">< /i></a>
        58                </div>
        59                <?php ec ho $this-> getChildHt ml('minica rt'); ?>
        60           </ div>
        61       </div>
        62       <?php
        63           $s econdary_m enu = Mage ::getStore Config('po rto_settin gs/header/ secondary_ menu_26',  $code);
        64           $m enu_title  = Mage::ge tStoreConf ig('porto_ settings/h eader/menu _title_2',  $code);
        65           $o nly_catego ries = $th is->getOnl yCategorie s();
        66       ?>
        67       <div c lass="head er-wrapper ">
        68           <d iv class=" container" >
        69                <div cla ss="menu-w rapper">
        70                    <div  class="dr opdown-men u">
        71                         <div class ="menu-con tainer">
        72                             <a hre f="javascr ipt:void(0 )"><?php e cho $menu_ title; ?>< /a>
        73                             <?php  $menuHelpe r = Mage:: helper('me gamenu');  ?>
        74                             <?php  $menuData  = $menuHel per->getMe nuData();  extract($m enuData);  ?>
        75                             <ul cl ass="menu  side-menu" >
        76                                 <? php echo $ menuHelper ->getMenuC ontent($on ly_categor ies); ?>
        77                             </ul>
        78                             <scrip t type="te xt/javascr ipt">
        79                                 // <![CDATA[
        80                                 va r SW_MENU_ POPUP_WIDT H = <?php  echo $_pop upWidth; ? >;
        81                                 jQ uery(funct ion($){
        82                                      $('.menu .side-menu ').et_menu ({
        83                                          type : "default "
        84                                      });
        85                                      $(docume nt).ready( function() {
        86                                          if($ (window).w idth()<992 )
        87                                               $(".header -container .type26 .h eader-main -right .se arch-area  a.search-i con").afte r($(".head er-contain er.type26  .header-wr apper .sea rch-area # search_min i_form").d etach());
        88                                          else
        89                                               $(".header -container .type26 .h eader-wrap per .searc h-area a.s earch-icon ").after($ (".header- container. type26 .he ader-main- right .sea rch-area # search_min i_form").d etach());
        90                                      });
        91                                      $(window ).resize(f unction(){
        92                                          if($ (window).w idth()<992 )
        93                                               $(".header -container .type26 .h eader-main -right .se arch-area  a.search-i con").afte r($(".head er-contain er.type26  .header-wr apper .sea rch-area # search_min i_form").d etach());
        94                                          else
        95                                               $(".header -container .type26 .h eader-wrap per .searc h-area a.s earch-icon ").after($ (".header- container. type26 .he ader-main- right .sea rch-area # search_min i_form").d etach());
        96                                      })
        97                                 }) ;
        98                                 // ]]>
        99                             </scri pt>
        100                         </div>
        101                    </di v>
        102                    <div  class="cu stom-menu- block">
        103                         <?php echo  $this->ge tLayout()- >createBlo ck('cms/bl ock')->set BlockId($s econdary_m enu)->toHt ml(); ?>
        104                    </di v>
        105                    <div  class="se arch-area" >
        106                         <a href="j avascript: void(0);"  class="sea rch-icon"> <i class=" icon-magni fier"></i> <span><?ph p echo $th is->__('Se arch'); ?> </a>
        107                         <?php echo  $this->ge tChildHtml ('topSearc h'); ?>
        108                    </di v>
        109                </div>
        110           </ div>
        111       </div>
        112   </div>
        113   <?php echo  $this->ge tChildHtml ('mobile.n av') ?>

Araxis Merge (but not the data content of this report) is Copyright © 1993-2010 Araxis Ltd (www.araxis.com). All rights reserved.