quick layout fix for restore backup ui

restore from backup screen was a bit wonky because the forms where running together, so threw in some breaks so it lays properly.
Merge pull request '[draft] Make init fresh page more responsive' (#118 ) from xarvh/fipamo:responsive-init-fresh into develop
2024-11-08 11:37:31 -06:00 · 2024-11-08 18:28:57 +01:00 · 2024-11-02 14:07:53 -06:00 · 2024-11-01 15:23:22 -06:00 · 2024-10-29 12:05:50 -06:00
6 changed files with 24 additions and 11 deletions
--- a/app/Http/Controllers/ThemeController.php
+++ b/app/Http/Controllers/ThemeController.php
@ -62,8 +62,10 @@ 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;
--- a/app/Services/Data/SortingService.php
+++ b/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'   => $page['title'],
+                        'title'   => urldecode($page['title']),
                        'slug'    => $page['slug'],
                        'path'    => $page['path'],
                        'feature' => $page['feature'],
--- a/content/themes/fipamo-default-v2/archive.blade.php
+++ b/content/themes/fipamo-default-v2/archive.blade.php
@ -14,14 +14,17 @@
                        <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'] }}">{{ $page['title'] }}</a><br/>
+                                        <a href="{{ "/".$item['year']."/".$data['month']."/".$page['slug'] }}">{{ $title }}</a><br/>
                                    @else
-                                        <a href="{{ "/".$item['year']."/".$data['month']."/".$page['slug'].".html" }}">{{ $page['title'] }}</a><br/>
+                                        <a href="{{ "/".$item['year']."/".$data['month']."/".$page['slug'].".html" }}">{{ $title }}</a><br/>
                                    @endif
                                @else
-                                    <a href="{{ "/".$item['year']."/".$data['month']."/".$page['slug'] }}">{{ $page['title'] }}</a><br/>
+                                    <a href="{{ "/".$item['year']."/".$data['month']."/".$page['slug'] }}">{{ $title }}</a><br/>
                                @endif
                            @endforeach
                        </div>
--- a/public/assets/css/dash/page-editor.css
+++ b/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: 97%;
+  width: 900px;
  top: 65px;
 }

@ -277,6 +277,10 @@ 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) {
@ -322,4 +326,8 @@ 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%;
+  }
 }
--- a/resources/views/forms/init-restore.blade.php
+++ b/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"/>
-    <label class="inline">password</label><input type="password"class="inline"  name="restore_member_pass" id="restore_member_pass" placeholder="password"/>
+    <label class="inline">handle</label><input type="text" class="inline" name="restore_member_handle" id="restore_member_handle" placeholder="handle"/><br  />
+    <label class="inline">password</label><input type="password"class="inline"  name="restore_member_pass" id="restore_member_pass" placeholder="password"/><br  />
    <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>
+        <label>Grab your content backup</label><br  />
        <input id="backup-content-upload" type="file" name="backup-content-upload" placeholder="Content Archive"/>
    </div>
    <div>
-        <label>Grab your file backup</label>
+        <label>Grab your file backup</label><br  />
        <input id="backup-files-upload" type="file" name="backup-files-upload" placeholder="File Archive"/>
    </div>
    <br/><br/>
--- a/resources/views/frame.blade.php
+++ b/resources/views/frame.blade.php
@ -3,7 +3,7 @@

 <head>
  <meta charset="UTF-8">
-  <meta name="theme-color" content="#d66365" />
+  <meta name="theme-color" content="#cf436b" />
  <meta name="viewport" content="width=device-width, initial-scale=1">
  <meta name="csrf-token" content="{{ csrf_token() }}">
  <title>
Author	SHA1	Message	Date
ro	37c5b6b28f	quick layout fix for restore backup ui restore from backup screen was a bit wonky because the forms where running together, so threw in some breaks so it lays properly.	2024-11-08 11:37:31 -06:00
ro	eadbbc59ae	Merge pull request '[draft] Make init fresh page more responsive' (#118 ) from xarvh/fipamo:responsive-init-fresh into develop Reviewed-on: https://koodu.h-i.works///projects/fipamo/pulls/118 Reviewed-by: ro	2024-11-08 18:28:57 +01:00
ro	84c6fa7a1a	theme color correction, editor responsive tweaks the theme color for the dashboard was incorrect, so that has been updated and the responsive sticky for the text formatter in the page editor went funky with posts that had a lot of text so that's been adjusted so it behaves as it should when it has to resize and stick	2024-11-02 14:07:53 -06:00
ro	f53bb588c5	patch for page preview page preview from editor was not working because it was not passing the page uuid correctly so it can be identified and rendered unto the theme viewer.	2024-11-01 15:23:22 -06:00
ro	9c432db209	fix for link encoding issue small bug where links in the archive and tag templates where being rendered as url encoded strings, so that needed to be decoded so it displays as normal text	2024-10-29 12:05:50 -06:00