Merge pull request #21 from harej/runpagesfrommain

Tweaking runpages text to clearly specify which wiki is affected
internetarchive · Jul 13, 2021 · 9e78888 · 9e78888
2 parents ec799d2 + a4aae62
commit 9e78888
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 8 deletions.
diff --git a/app/src/html/Includes/pagefunctions.php b/app/src/html/Includes/pagefunctions.php
@@ -4624,6 +4624,7 @@ function loadRunPages()
 	}
 
 	$bodyHTML->assignElement( "wikitable", $tableHTML );
+	$bodyHTML->assignElement( "currentwiki", "{{{" . $accessibleWikis[WIKIPEDIA]['i18nsourcename'] . WIKIPEDIA . "name}}}" );
 	if( $accessibleWikis[WIKIPEDIA]['runpage'] === true ) {
 		$runpage = DB::getConfiguration( WIKIPEDIA, "wikiconfig", "runpage" );
 		if( $runpage == "enable" || $runpage === false ) {

diff --git a/app/src/html/Templates/runpages.html b/app/src/html/Templates/runpages.html
@@ -4,15 +4,14 @@ <h1>{{{runpages}}}</h1>
 <div class="container-fluid">
 	<div class="row">
 		<form method="post" action="index.php?page=runpages&action=togglerunpage">
-			<span class="form-inline"> <h2>{{{thiswikiis}}}: {{{{status}}}} --> <input type="text" id="reason"
-			                                                                           name="reason"
-			                                                                           class="form-control"
-			                                                                           placeholder="{{{reasonplaceholder}}}">{{{{button}}}}</h2></span>
+			<h2 class="form-inline"> {{{runpage_selectedwiki_label}}}: <b>{{{{currentwiki}}}}</b></h2>
+			<h3 class="form-inline"> {{{runpage_status_label}}}: <b>{{{{status}}}}</b>.</h3>
+			<span class="form-inline"><input type="text" id="reason" name="reason"class="form-control" placeholder="{{{reasonplaceholder}}}">{{{{button}}}}</span>
 			<input type="hidden" value="{{csrftoken}}" name="token">
 			<input type="hidden" value="{{checksum}}" name="checksum">
 		</form>
 	</div>
 	<div class="row">
 		{{{{wikitable}}}}
 	</div>
-</div>
+</div>
diff --git a/app/src/html/i18n/en.json b/app/src/html/i18n/en.json
@@ -755,7 +755,6 @@
   "tag_cites0": "Tag with a dead link template",
   "tag_cites1": "Use the dead link parameter on the cite template",
   "runpages": "Bot runpages",
-  "thiswikiis": "This wiki is",
   "enabled": "Enabled",
   "disabled": "Disabled",
   "gotorunpage": "Goto runpage",
@@ -802,5 +801,7 @@
   "availabilityThrottle": "Internet Archive Availability requests throttle",
   "availabilityThrottleplaceholder": "Requests per minute.  Set to 0 to disable throttle.",
   "rate_limit": "Edit rate limit",
-  "rate_limitplaceholder": "x per (minute|second|hour|day|month|year|week)  (This disables bot queuing)"
+  "rate_limitplaceholder": "x per (minute|second|hour|day|month|year|week)  (This disables bot queuing)",
+  "runpage_status_label": "On the selected wiki the bot is currently",
+  "runpage_selectedwiki_label": "Change bot run status for"
 }
diff --git a/app/src/html/i18n/qqq.json b/app/src/html/i18n/qqq.json
@@ -581,5 +581,7 @@
 	"availabilityThrottle": "Label for a setting",
 	"availabilityThrottleplaceholder": "Description of a setting",
 	"rate_limit": "Label for a setting",
-	"rate_limitplaceholder": "Description of a setting"
+	"rate_limitplaceholder": "Description of a setting",
+	"runpage_status_label": "Label for a status indicator",
+	"runpage_selectedwiki_label": "Label for a status indicator"
 }