- 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) git-svn-id: http://piwigo.org/svn/trunk@13872 68402e56-0260-453c-a942-63ccdbb3a9ee
This commit is contained in:
parent
7f9c121049
commit
5a05371627
4 changed files with 8 additions and 15 deletions
|
|
@ -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');
|
||||
|
||||
|
|
|
|||
|
|
@ -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))
|
||||
|
|
|
|||
|
|
@ -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;}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue