app/Http/Controllers/ThemeController.php

@@ -62,10 +62,8 @@ class ThemeController extends Controller
                     //if coming from theme page, grabs id of latest page
                     if ($id == null) {
                         $uuid = $this->getPageUUID();
-                    } else {
-                        //get page by uuid
-                        $page = $this->pages->getByUuid($id);
                     }
+                    $page = $this->pages->getByUuid($uuid);
                 }
                 $pageData = $this->sort->page($page);
                 break;

app/Services/Data/SortingService.php

@@ -90,7 +90,7 @@ class SortingService
             if (isset($page['tags'])) {
                 if (strpos($page['tags'], $tag) !== false) {
                     array_push($tagged, [
-                        'title'   => urldecode($page['title']),
+                        'title'   => $page['title'],
                         'slug'    => $page['slug'],
                         'path'    => $page['path'],
                         'feature' => $page['feature'],

content/themes/fipamo-default-v2/archive.blade.php

@@ -14,17 +14,14 @@
                         <div role="archive-month">
                             <h3>{{ $data['full_month'] }}</h3>
                             @foreach($data['pages'] as $page)
-                                @php
-                                    $title = urldecode($page['title']);
-                                @endphp
                                 @if(isset($dynamicRender))
                                     @if($dynamicRender == 'true')
-                                        <a href="{{ "/".$item['year']."/".$data['month']."/".$page['slug'] }}">{{ $title }}</a><br/>
+                                        <a href="{{ "/".$item['year']."/".$data['month']."/".$page['slug'] }}">{{ $page['title'] }}</a><br/>
                                     @else
-                                        <a href="{{ "/".$item['year']."/".$data['month']."/".$page['slug'].".html" }}">{{ $title }}</a><br/>
+                                        <a href="{{ "/".$item['year']."/".$data['month']."/".$page['slug'].".html" }}">{{ $page['title'] }}</a><br/>
                                     @endif
                                 @else
-                                    <a href="{{ "/".$item['year']."/".$data['month']."/".$page['slug'] }}">{{ $title }}</a><br/>
+                                    <a href="{{ "/".$item['year']."/".$data['month']."/".$page['slug'] }}">{{ $page['title'] }}</a><br/>
                                 @endif
                             @endforeach
                         </div>

public/assets/css/dash/page-editor.css

@@ -207,7 +207,7 @@ main > section.text-editor > div.text-editor-control {
 .control-freeze {
   position: fixed;
   z-index: 300;
-  width: 900px;
+  width: 97%;
   top: 65px;
 }
 
@@ -277,10 +277,6 @@ main section.text-editor div.edit-post-wrapper pre code {
   main > section.text-editor {
     width: 97%;
   }
-
-  .control-freeze {
-    width: 97%;
-  }
 }
 
 @media only screen and (max-width: 480px) {
@@ -326,8 +322,4 @@ main section.text-editor div.edit-post-wrapper pre code {
   main section.text-editor div.edit-post-wrapper #highlight {
     font-size: 0.8em;
   }
-
-  .control-freeze {
-    width: 96%;
-  }
 }

resources/views/forms/init-restore.blade.php

@@ -4,15 +4,15 @@
     </a>
 </div>
 <form id="init-restore" method="POST">
-    <label class="inline">handle</label><input type="text" class="inline" name="restore_member_handle" id="restore_member_handle" placeholder="handle"/><br  />
+    <label class="inline">handle</label><input type="text" class="inline" name="restore_member_handle" id="restore_member_handle" placeholder="handle"/>
-    <label class="inline">password</label><input type="password"class="inline"  name="restore_member_pass" id="restore_member_pass" placeholder="password"/><br  />
+    <label class="inline">password</label><input type="password"class="inline"  name="restore_member_pass" id="restore_member_pass" placeholder="password"/>
     <label class="inline">previous</label><input type="text" class="inline" name="restore_former_url" id="restore_former_url" placeholder="previous site url"/>
     <div>
-        <label>Grab your content backup</label><br  />
+        <label>Grab your content backup</label>
         <input id="backup-content-upload" type="file" name="backup-content-upload" placeholder="Content Archive"/>
     </div>
     <div>
-        <label>Grab your file backup</label><br  />
+        <label>Grab your file backup</label>
         <input id="backup-files-upload" type="file" name="backup-files-upload" placeholder="File Archive"/>
     </div>
     <br/><br/>

resources/views/frame.blade.php

@@ -3,7 +3,7 @@
 
 <head>
   <meta charset="UTF-8">
-  <meta name="theme-color" content="#cf436b" />
+  <meta name="theme-color" content="#d66365" />
   <meta name="viewport" content="width=device-width, initial-scale=1">
   <meta name="csrf-token" content="{{ csrf_token() }}">
   <title>