Geocaches approval refactoring, fixes #1672, affects #48 (#2354)

* Geocaches approval refactoring * forgotten unlock fixed * php-cs compliants fixed * Removed jsRender, javascript templates changed to handlebars and moved to a subtemplate, template names changed to camelCase, viewcache.php in templates changed to ViewCacheController class link
opencaching · Jun 22, 2022 · 945eeaf · 945eeaf
1 parent ac02a7e
commit 945eeaf
Show file tree

Hide file tree

Showing 18 changed files with 1,219 additions and 369 deletions.
diff --git a/config/menu/adminPages.default.php b/config/menu/adminPages.default.php
@@ -16,20 +16,21 @@
  * Do NOT change $menu variable name!
  */
 
-use src\Utils\Uri\SimpleRouter;
 use src\Controllers\Admin\CacheSetAdminController;
+use src\Utils\Uri\SimpleRouter;
 
 /** @var array $links OcConfig::$links is accessible in within this scope */
 
 $menu = [
     'mnu_reports' => '/admin_reports.php', // counters added in MainLayoutCtrl
-    'mnu_pendings' => '/viewpendings.php', // counters added in MainLayoutCtrl
+    'mnu_pendings' => SimpleRouter::getLink('Admin.GeoCacheApprovalAdmin'), // counters added in MainLayoutCtrl
     'mnu_octeamStats' => '/articles.php?page=cog',
     'mnu_notFoundCaches' => '/admin_cachenotfound.php',
-    'mnu_searchUser' => SimpleRouter::getLink('Admin.UserAdmin','search'),
+    'mnu_searchUser' => SimpleRouter::getLink('Admin.UserAdmin', 'search'),
     'mnu_ocTeamNews' => SimpleRouter::getLink('News.NewsAdmin'),
     'mnu_geoPathAdmin' => '/powerTrailCOG.php',
     'mnu_abandonCacheSets' => SimpleRouter::getLink(
-        CacheSetAdminController::class, 'cacheSetsToArchive'
+        CacheSetAdminController::class,
+        'cacheSetsToArchive'
     ),
 ];
diff --git a/lib/languages/en.php b/lib/languages/en.php
@@ -3214,4 +3214,11 @@
     'at_day' => 'NOT recommended at night',
     'at_notinwinter' => 'NOT available during winter',
     'at_allseasons' => 'Available all seasons',
+
+    'cache_approval_refresh' => 'Refresh list',
+    'cache_approval_refresh_time' => 'Last update',
+    'cache_approval_nonamed' => 'no name',
+    'cache_approval_no_caches' => 'No geocaches waiting to be accepted',
+    'cache_approval_changed_time' => 'status changed',
+    'cache_approval_cache_invalid' => 'Cache "%s" is not valid for approval actions',
 ];
diff --git a/public/css/style_screen.css b/public/css/style_screen.css
@@ -1339,3 +1339,7 @@ tr.geoKretLog {
 .float-right {
     float: right;
 }
+
+.hidden {
+    display: none;
+}
diff --git a/public/views/admin/geocacheApproval/geocache_approval.css b/public/views/admin/geocacheApproval/geocache_approval.css
@@ -0,0 +1,147 @@
+.geocacheApproval-truncated {
+    display: inline-block;
+    width: 130px;
+    white-space: nowrap;
+    overflow: hidden;
+    text-overflow: ellipsis;
+}
+
+#geocacheApproval_info {
+    height: 2.2em;
+}
+
+.geocacheApproval-acceptedInfo {
+    font-weight: bold;
+    color: #007000;
+}
+
+.geocacheApproval-rejectedInfo {
+    font-weight: bold;
+    color: #550000;
+}
+
+.geocacheApproval-errorInfo {
+    font-weight: bold;
+    color: #A00000;
+}
+
+.geocacheApproval-icon {
+    float: left;
+    margin-right: 8px;
+}
+
+.geocacheApproval-hidden {
+    display: none;
+}
+
+.geocacheApproval-refreshBlock {
+    width: 97%;
+    clear: both;
+    padding: 3px 0px;
+}
+
+.geocacheApproval-refreshButton {
+    display: block;
+    float: left;
+    margin-bottom: 3px;
+    font-size: 1.2em;
+}
+
+.geocacheApproval-refreshInfo {
+    display: block;
+    float: right;
+}
+
+.geocacheApproval-emptyList {
+    text-align: center !important;
+    padding: 3px 0px !important;
+    font-weight: bold;
+}
+
+.geocacheApproval-region {
+    font-weight:bold;
+    font-size:10px;
+    color:blue;
+}
+
+.geocacheApproval-confirmDialog-noTitlebar .ui-dialog-titlebar {
+    display: none;
+}
+
+.geocacheApproval-confirmDialog-content {
+    text-align: center;
+}
+
+.geocacheApproval-confirmDialog-content2 {
+    display: inline-block;
+    font-size: 1.2em;
+    margin-left: auto;
+    margin-right: auto;
+    text-align: justify;
+}
+
+.geocacheApproval-confirmDialog-buttons {
+    padding-top: 3em;
+}
+
+.geocacheApproval-confirmDialog.ui-widget.ui-widget-content {
+    border: 1px solid #A0A0A0;
+}
+
+.geocacheApproval-confirmDialog .ui-dialog-buttonpane {
+    padding-right: .3em !important;
+}
+
+.geocacheApproval-confirmDialog .ui-dialog-buttonpane .ui-dialog-buttonset {
+    float: none !important;
+}
+
+.geocacheApproval-confirmDialog .ui-dialog-buttonpane .ui-dialog-buttonset button {
+    box-sizing: border-box;
+    padding: 6px 11px;
+    margin: 5px 0;
+    border-radius: 4px;
+    border: 1px solid;
+    font-size: 14px;
+    background: none;
+}
+
+.geocacheApproval-confirmDialog-cancelButton {
+    float: right !important;
+    color: #333 !important;
+    background-color: #fff !important;
+    border-color: #ccc !important;
+}
+
+.geocacheApproval-confirmDialog-cancelButton:hover {
+    color: #333 !important;
+    background-color: #e6e6e6 !important;
+    border-color: #adadad !important;
+}
+
+.geocacheApproval-confirmDialog-acceptButton,
+.geocacheApproval-confirmDialog-blockButton {
+    float: left !important;
+    color: #fff !important;
+}
+
+.geocacheApproval-confirmDialog-acceptButton {
+    background-color: #5cb85c !important;
+    border-color: #4cae4c !important;
+}
+
+.geocacheApproval-confirmDialog-acceptButton:hover {
+    background-color: #449d44 !important;
+    border-color: #398439 !important;
+}
+
+.geocacheApproval-confirmDialog-blockButton {
+    background-color: #d9534f !important;
+    border-color: #d43f3a !important;
+}
+
+.geocacheApproval-confirmDialog-blockButton:hover {
+    color: #fff !important;
+    background-color: #c9302c !important;
+    border-color: #ac2925 !important;
+}