Browse Source

Replace some instances of "collage" with "collection"

spaghetti 8 years ago
parent
commit
05e867aa2b

+ 3
- 3
sections/collages/edit.php View File

17
   error(403);
17
   error(403);
18
 }
18
 }
19
 
19
 
20
-View::show_header('Edit collage');
20
+View::show_header('Edit collection');
21
 
21
 
22
 if (!empty($Err)) {
22
 if (!empty($Err)) {
23
   if (isset($ErrNoEscape)) {
23
   if (isset($ErrNoEscape)) {
29
 ?>
29
 ?>
30
 <div class="thin">
30
 <div class="thin">
31
   <div class="header">
31
   <div class="header">
32
-    <h2>Edit collage <a href="collages.php?id=<?=$CollageID?>"><?=$Name?></a></h2>
32
+    <h2>Edit collection <a href="collages.php?id=<?=$CollageID?>"><?=$Name?></a></h2>
33
   </div>
33
   </div>
34
   <div class="box pad">
34
   <div class="box pad">
35
   <form class="edit_form" name="collage" action="collages.php" method="post">
35
   <form class="edit_form" name="collage" action="collages.php" method="post">
95
 
95
 
96
 <? } ?>
96
 <? } ?>
97
       <tr>
97
       <tr>
98
-        <td colspan="2" class="center"><input type="submit" value="Edit collage" /></td>
98
+        <td colspan="2" class="center"><input type="submit" value="Edit collection" /></td>
99
       </tr>
99
       </tr>
100
     </table>
100
     </table>
101
   </form>
101
   </form>

+ 2
- 2
sections/collages/manage.php View File

38
   $TorrentList = array();
38
   $TorrentList = array();
39
 }
39
 }
40
 
40
 
41
-View::show_header("Manage collage: $Name", 'jquery-ui,jquery.tablesorter,sort');
41
+View::show_header("Manage collection: $Name", 'jquery-ui,jquery.tablesorter,sort');
42
 
42
 
43
 ?>
43
 ?>
44
 <div class="thin">
44
 <div class="thin">
45
   <div class="header">
45
   <div class="header">
46
-    <h2>Manage collage <a href="collages.php?id=<?=$CollageID?>"><?=$Name?></a></h2>
46
+    <h2>Manage collection <a href="collages.php?id=<?=$CollageID?>"><?=$Name?></a></h2>
47
   </div>
47
   </div>
48
   <table width="100%" class="layout">
48
   <table width="100%" class="layout">
49
     <tr class="colhead"><td id="sorting_head">Sorting</td></tr>
49
     <tr class="colhead"><td id="sorting_head">Sorting</td></tr>

+ 4
- 4
sections/reports/array.php View File

13
         <ul>
13
         <ul>
14
         <li>Torrent uploads</li>
14
         <li>Torrent uploads</li>
15
         <li>Forum threads/posts</li>
15
         <li>Forum threads/posts</li>
16
-        <li>Collages</li>
16
+        <li>Collections</li>
17
         <li>Requests</li>
17
         <li>Requests</li>
18
         </ul>",
18
         </ul>",
19
         "These have their own specific section for reporting, found on their respective pages.",
19
         "These have their own specific section for reporting, found on their respective pages.",
62
       )
62
       )
63
     ),
63
     ),
64
     "collage" => array(
64
     "collage" => array(
65
-      "title" => "Collage",
65
+      "title" => "Collection",
66
       "guidelines" => array(
66
       "guidelines" => array(
67
-        "The report collage option is for reporting a collage which breaks one of the collage guidelines found on the <a href=\"rules.php?p=collages\">collage rules page</a>.",
68
-        "Collage rules are an interpreted concept, and it is up to staff to interpret these rules. If you feel like this collage might be a borderline case between allowed and not allowed, feel free to report it, and we will look into it.",
67
+        "The report collection option is for reporting a collection which breaks one of the collection guidelines found on the <a href=\"rules.php?p=collages\">collection rules page</a>.",
68
+        "Collection rules are an interpreted concept, and it is up to staff to interpret these rules. If you feel like this collection might be a borderline case between allowed and not allowed, feel free to report it, and we will look into it.",
69
         "We encourage all users to use this feature whenever possible. This will get quicker action than PMing a staff member will.",
69
         "We encourage all users to use this feature whenever possible. This will get quicker action than PMing a staff member will.",
70
         "In your report description below, please be specific and include as much information as possible that will help our staff resolve the issue."
70
         "In your report description below, please be specific and include as much information as possible that will help our staff resolve the issue."
71
       )
71
       )

+ 1
- 1
sections/reports/report.php View File

224
     break;
224
     break;
225
   case 'collage':
225
   case 'collage':
226
 ?>
226
 ?>
227
-  <p>You are reporting the collage:</p>
227
+  <p>You are reporting the collection:</p>
228
   <table class="box">
228
   <table class="box">
229
     <tr class="colhead">
229
     <tr class="colhead">
230
       <td>Title</td>
230
       <td>Title</td>

+ 5
- 5
sections/userhistory/subscribed_collages.php View File

6
   error(403);
6
   error(403);
7
 }
7
 }
8
 
8
 
9
-View::show_header('Subscribed collages','browse,collage');
9
+View::show_header('Subscribed collections','browse,collage');
10
 
10
 
11
 $ShowAll = !empty($_GET['showall']);
11
 $ShowAll = !empty($_GET['showall']);
12
 
12
 
43
 ?>
43
 ?>
44
 <div class="thin">
44
 <div class="thin">
45
   <div class="header">
45
   <div class="header">
46
-    <h2>Subscribed collages<?=($ShowAll ? '' : ' with new additions')?></h2>
46
+    <h2>Subscribed collections<?=($ShowAll ? '' : ' with new additions')?></h2>
47
 
47
 
48
     <div class="linkbox">
48
     <div class="linkbox">
49
 <?
49
 <?
50
 if ($ShowAll) {
50
 if ($ShowAll) {
51
 ?>
51
 ?>
52
       <br /><br />
52
       <br /><br />
53
-      <a href="userhistory.php?action=subscribed_collages&amp;showall=0" class="brackets">Only display collages with new additions</a>&nbsp;&nbsp;&nbsp;
53
+      <a href="userhistory.php?action=subscribed_collages&amp;showall=0" class="brackets">Only display collections with new additions</a>&nbsp;&nbsp;&nbsp;
54
 <?
54
 <?
55
 } else {
55
 } else {
56
 ?>
56
 ?>
57
       <br /><br />
57
       <br /><br />
58
-      <a href="userhistory.php?action=subscribed_collages&amp;showall=1" class="brackets">Show all subscribed collages</a>&nbsp;&nbsp;&nbsp;
58
+      <a href="userhistory.php?action=subscribed_collages&amp;showall=1" class="brackets">Show all subscribed collections</a>&nbsp;&nbsp;&nbsp;
59
 <?
59
 <?
60
 }
60
 }
61
 ?>
61
 ?>
66
 if (!$NumResults) {
66
 if (!$NumResults) {
67
 ?>
67
 ?>
68
   <div class="center">
68
   <div class="center">
69
-    No subscribed collages<?=($ShowAll ? '' : ' with new additions')?>
69
+    No subscribed collections<?=($ShowAll ? '' : ' with new additions')?>
70
   </div>
70
   </div>
71
 <?
71
 <?
72
 } else {
72
 } else {

Loading…
Cancel
Save