Skip to content

Commit 0bd0448

Browse files
author
ddwiggins
committed
remove old "new" collection sorting, since it was never ported to jquery and the new inline jquery collections sorting does the same thing. git-svn-id: http://svn.resourcespace.org/svn/resourcespace@3811 c08608d7-6e46-0410-86ca-f2a6f1370df5
1 parent e05a189 commit 0bd0448

5 files changed

+0
-168
lines changed

include/config.default.php

-3
Original file line numberDiff line numberDiff line change
@@ -582,9 +582,6 @@
582582
# Enable captioning and ranking of collections (deprecated - use $collection_commenting instead)
583583
$collection_reorder_caption=false;
584584

585-
# Enable new-style collection sorting
586-
$collection_sorting = false;
587-
588585
# Enable collection commenting and ranking
589586
$collection_commenting = false;
590587

pages/ajax/collections_frameless_loader.php

-1
Original file line numberDiff line numberDiff line change
@@ -134,7 +134,6 @@
134134
<?php if (checkperm("s")) { ?>
135135
<?php if ($allow_share && (checkperm("v") || checkperm("g"))) { ?><li><a href="<?php echo $baseurl_short?>pages/collection_share.php?ref=<?php echo $usercollection?>">&gt; <?php echo $lang["share"]?></a></li><?php } ?>
136136
<?php if (($userref==$cinfo["user"]) || (checkperm("h"))) {?><li><a href="<?php echo $baseurl_short?>pages/collection_edit.php?ref=<?php echo $usercollection?>">&gt;&nbsp;<?php echo $allow_share?$lang["action-edit"]:$lang["editcollection"]?></a></li><?php } ?>
137-
<?php if ((($userref==$cinfo["user"]) || (checkperm("h"))) && $collection_sorting) {?><li><a href="<?php echo $baseurl_short?>pages/collection_sort.php?collection=<?php echo $usercollection?>">&gt;&nbsp;<?php echo $lang["sort"]?></a></li><?php } ?>
138137
<?php } ?>
139138
<?php if ($feedback) {?><li><a href="<?php echo $baseurl_short?>pages/collection_feedback.php?collection=<?php echo $usercollection?>&k=<?php echo $k?>">&gt;&nbsp;<?php echo $lang["sendfeedback"]?></a></li><?php } ?>
140139
<?php } else {

pages/collection_manage.php

-2
Original file line numberDiff line numberDiff line change
@@ -372,8 +372,6 @@
372372

373373
<?php if (($username==$collections[$n]["username"]) || (checkperm("h"))) {?>&nbsp;<a href="collection_edit.php?ref=<?php echo $collections[$n]["ref"]?>" onClick="return CentralSpaceLoad(this,true);" >&gt;&nbsp;<?php echo $lang["action-edit"]?></a><?php } ?>
374374

375-
<?php if ((($username==$collections[$n]["username"]) || (checkperm("h"))) && $collection_sorting) {?>&nbsp;<a href="collection_sort.php?collection=<?php echo $collections[$n]['ref'] ?>" onClick="return CentralSpaceLoad(this,true);">&gt;&nbsp;<?php echo $lang["sort"]?></a><?php } ?>
376-
377375
<?php
378376
# If this collection is (fully) editable, then display an edit all link
379377
if (($collections[$n]["count"] > 0) && allow_multi_edit($collections[$n]["ref"]) && $show_edit_all_link ) { ?>&nbsp;<a href="edit.php?collection=<?php echo $collections[$n]["ref"]?>" target="main" onClick="return CentralSpaceLoad(this,true);">&gt;&nbsp;<?php echo $lang["action-editall"]?></a>&nbsp;<?php } ?>

pages/collection_sort.php

-160
This file was deleted.

pages/collections.php

-2
Original file line numberDiff line numberDiff line change
@@ -542,7 +542,6 @@ function ToggleThumbs()
542542
<?php if ($contact_sheet==true && $collections_compact_style) { ?><li><a href="contactsheet_settings.php?ref=<?php echo $usercollection?>" target="main">&gt;&nbsp;<?php echo $lang["contactsheet"]?></a></li><?php } ?>
543543
<?php if ($allow_share) { ?><li><a href="collection_share.php?ref=<?php echo $usercollection?>" target="main">&gt; <?php echo $lang["share"]?></a></li><?php } ?>
544544
<?php if (($userref==$cinfo["user"]) || (checkperm("h"))) {?><li><a target="main" href="collection_edit.php?ref=<?php echo $usercollection?>">&gt;&nbsp;<?php echo $allow_share?$lang["action-edit"]:$lang["editcollection"]?></a></li><?php } ?>
545-
<?php if ((($userref==$cinfo["user"]) || (checkperm("h"))) && $collection_sorting) {?><li><a target="main" href="collection_sort.php?collection=<?php echo $usercollection?>">&gt;&nbsp;<?php echo $lang["sort"]?></a></li><?php } ?>
546545
<?php if ($preview_all){?><li><a href="preview_all.php?ref=<?php echo $usercollection?>" target="main">&gt;&nbsp;<?php echo $lang["preview_all"]?></a></li><?php } ?>
547546
<?php hook("collectiontool2");?>
548547
<?php if ($feedback) {?><li><a target="main" href="collection_feedback.php?collection=<?php echo $usercollection?>&k=<?php echo $k?>">&gt;&nbsp;<?php echo $lang["sendfeedback"]?></a></li><?php } ?>
@@ -803,7 +802,6 @@ function ToggleThumbs()
803802
<?php if ($allow_share) { ?><li><a href="collection_share.php?ref=<?php echo $usercollection?>" target="main"><?php echo $lang["share"]?></a></li><?php } ?>
804803

805804
<?php if (($userref==$cinfo["user"]) || (checkperm("h"))) {?><li><a target="main" href="collection_edit.php?ref=<?php echo $usercollection?>">&nbsp;<?php echo $allow_share?$lang["action-edit"]:$lang["editcollection"]?></a></li><?php } ?>
806-
<?php if ((($userref==$cinfo["user"]) || (checkperm("h"))) && $collection_sorting) {?><li><a target="main" href="collection_sort.php?collection=<?php echo $usercollection?>">&nbsp;<?php echo $lang["sort"]?></a></li><?php } ?>
807805

808806
<?php if ($preview_all){?><li><a href="preview_all.php?ref=<?php echo $usercollection?>" target="main"><?php echo $lang["preview_all"]?></a></li><?php } ?>
809807
<?php hook('collectiontool2min');?>

0 commit comments

Comments
 (0)