Changeset 13872


Ignore:
Timestamp:
04/03/12 20:18:26 (8 years ago)
Author:
rvelices
Message:
  • is_homepage not set for flat view/calendar modes
  • added require jquery for some footer_script
  • removed unused/unnecesary css (hope I'm done for now)
  • if page[start] is greater than number of items than page not found (google+bing bots automatically detect patterns and increment start parameter)
Location:
trunk
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • trunk/include/section_init.inc.php

    r13458 r13872  
    289289      else 
    290290      { 
     291        unset($page['is_homepage']); 
    291292        $where_sql = '1=1'; 
    292293      } 
     
    546547if (isset($page['chronology_field'])) 
    547548{ 
     549  unset($page['is_homepage']); 
    548550  include_once( PHPWG_ROOT_PATH.'include/functions_calendar.inc.php' ); 
    549551  initialize_calendar(); 
  • trunk/index.php

    r13458 r13872  
    4040  check_restrictions($page['category']['id']); 
    4141} 
     42if ($page['start']>0 && $page['start']>=count($page['items'])) 
     43{ 
     44  page_not_found('', duplicate_index_url(array('start'=>0))); 
     45} 
    4246 
    4347trigger_action('loc_begin_index'); 
  • trunk/themes/default/template/index.tpl

    r13870 r13872  
    1818                        {/foreach} 
    1919                </div> 
    20                 {footer_script}{literal} 
     20                {footer_script require='jquery'}{literal} 
    2121jQuery("#sortOrderLink").click(function() { 
    2222        var elt = jQuery("#sortOrderBox"); 
     
    4646                        {/foreach} 
    4747                </div> 
    48                 {footer_script}{literal} 
     48                {footer_script require='jquery'}{literal} 
    4949jQuery("#derivativeSwitchLink").click(function() { 
    5050        var elt = jQuery("#derivativeSwitchBox"); 
  • trunk/themes/default/theme.css

    r13865 r13872  
    550550} 
    551551 
    552 .filter .tagSelection LABEL { 
    553         display: inline; 
    554         float: none; 
    555         margin-right:0.5em;/*reduce from above*/ 
    556 } 
    557  
    558552/*IE6 needs override because of > selector*/ 
    559553.filter LABEL>INPUT, 
     
    591585        margin: 0; 
    592586        padding: 0 0.5em 0 0; 
    593 } 
    594  
    595 /* button tools */ 
    596 .actions A, .actions IMG { 
    597         border: none; 
    598587} 
    599588 
     
    813802} 
    814803 
    815 #pictureComments INPUT[type=submit]     { margin: 0;} 
    816  
    817804/* image info table */ 
    818805 
Note: See TracChangeset for help on using the changeset viewer.