diff options
| -rw-r--r-- | include/section_init.inc.php | 2 | ||||
| -rw-r--r-- | index.php | 4 | ||||
| -rw-r--r-- | themes/default/template/index.tpl | 4 | ||||
| -rw-r--r-- | themes/default/theme.css | 13 |
4 files changed, 8 insertions, 15 deletions
diff --git a/include/section_init.inc.php b/include/section_init.inc.php index 954561a2f..2bfb1e9b5 100644 --- a/include/section_init.inc.php +++ b/include/section_init.inc.php @@ -288,6 +288,7 @@ SELECT id } else { + unset($page['is_homepage']); $where_sql = '1=1'; } } @@ -545,6 +546,7 @@ SELECT DISTINCT(id) if (isset($page['chronology_field'])) { + unset($page['is_homepage']); include_once( PHPWG_ROOT_PATH.'include/functions_calendar.inc.php' ); initialize_calendar(); } @@ -39,6 +39,10 @@ if (isset($page['category'])) { check_restrictions($page['category']['id']); } +if ($page['start']>0 && $page['start']>=count($page['items'])) +{ + page_not_found('', duplicate_index_url(array('start'=>0))); +} trigger_action('loc_begin_index'); diff --git a/themes/default/template/index.tpl b/themes/default/template/index.tpl index 8f4e6027b..394add583 100644 --- a/themes/default/template/index.tpl +++ b/themes/default/template/index.tpl @@ -17,7 +17,7 @@ {/if} {/foreach} </div> - {footer_script}{literal} + {footer_script require='jquery'}{literal} jQuery("#sortOrderLink").click(function() { var elt = jQuery("#sortOrderBox"); elt.css("left", Math.min( jQuery(this).offset().left, jQuery(window).width() - elt.outerWidth(true) - 5)) @@ -45,7 +45,7 @@ jQuery("#sortOrderBox").on("mouseleave", function() { {/if} {/foreach} </div> - {footer_script}{literal} + {footer_script require='jquery'}{literal} jQuery("#derivativeSwitchLink").click(function() { var elt = jQuery("#derivativeSwitchBox"); elt.css("left", Math.min( jQuery(this).offset().left, jQuery(window).width() - elt.outerWidth(true) - 5)) diff --git a/themes/default/theme.css b/themes/default/theme.css index b6f03efc8..e1be25396 100644 --- a/themes/default/theme.css +++ b/themes/default/theme.css @@ -549,12 +549,6 @@ FIELDSET { float: none; } -.filter .tagSelection LABEL { - display: inline; - float: none; - margin-right:0.5em;/*reduce from above*/ -} - /*IE6 needs override because of > selector*/ .filter LABEL>INPUT, .filter LABEL>SELECT { @@ -592,11 +586,6 @@ FIELDSET { padding: 0 0.5em 0 0; } -/* button tools */ -.actions A, .actions IMG { - border: none; -} - .tagSelection { width: 99%; margin: 1em 0; @@ -812,8 +801,6 @@ LEGEND { margin: 5px 0; text-align: left; } -#pictureComments INPUT[type=submit] { margin: 0;} - /* image info table */ .imageInfoTable {display:table; margin: auto;} |