xarvh/fipamo
1
0
Fork 0
forked from projects/fipamo
Code Pull requests Activity

Compare commits

merge into: xarvh:responsive-init-fresh
Branches Tags
xarvh:develop
xarvh:responsive-init-fresh
xarvh:slim-php-version-freeze
xarvh:toggle-buttons-#109
xarvh:beta
xarvh:nodejs-version-freeze
xarvh:sql-version-freeze
projects:develop
projects:slim-php-version-freeze
projects:toggle-buttons-#109
projects:beta
projects:nodejs-version-freeze
projects:sql-version-freeze
xarvh:b2.6.1
xarvh:b2.6.0
xarvh:b2.5.1
xarvh:b2.5.0
xarvh:b2.4.1
xarvh:b2.4.0
xarvh:b2.3.0
xarvh:b2.2.4
xarvh:b2.2.3
xarvh:b2.2.2
xarvh:b2.2.1
xarvh:b2.2.0
xarvh:b2.1.1
xarvh:b2.1.0
xarvh:b2.0.0
xarvh:b1.2.4
xarvh:b1.2.3
xarvh:b1.2.2
xarvh:b1.2.1
xarvh:b1.2.0
xarvh:b1.0.1
xarvh:1.0.0
projects:b2.6.1
projects:b2.6.0
projects:b2.5.1
projects:b2.5.0
projects:b2.4.1
projects:b2.4.0
projects:b2.3.0
projects:b2.2.4
projects:b2.2.3
projects:b2.2.2
projects:b2.2.1
projects:b2.2.0
projects:b2.1.1
projects:b2.1.0
projects:b2.0.0
projects:b1.2.4
projects:b1.2.3
projects:b1.2.2
projects:b1.2.1
projects:b1.2.0
projects:b1.0.1
projects:1.0.0
...
pull from: projects:develop
Branches Tags
projects:develop
projects:slim-php-version-freeze
projects:toggle-buttons-#109
projects:beta
projects:nodejs-version-freeze
projects:sql-version-freeze
xarvh:develop
xarvh:responsive-init-fresh
xarvh:slim-php-version-freeze
xarvh:toggle-buttons-#109
xarvh:beta
xarvh:nodejs-version-freeze
xarvh:sql-version-freeze
projects:b2.6.1
projects:b2.6.0
projects:b2.5.1
projects:b2.5.0
projects:b2.4.1
projects:b2.4.0
projects:b2.3.0
projects:b2.2.4
projects:b2.2.3
projects:b2.2.2
projects:b2.2.1
projects:b2.2.0
projects:b2.1.1
projects:b2.1.0
projects:b2.0.0
projects:b1.2.4
projects:b1.2.3
projects:b1.2.2
projects:b1.2.1
projects:b1.2.0
projects:b1.0.1
projects:1.0.0
xarvh:b2.6.1
xarvh:b2.6.0
xarvh:b2.5.1
xarvh:b2.5.0
xarvh:b2.4.1
xarvh:b2.4.0
xarvh:b2.3.0
xarvh:b2.2.4
xarvh:b2.2.3
xarvh:b2.2.2
xarvh:b2.2.1
xarvh:b2.2.0
xarvh:b2.1.1
xarvh:b2.1.0
xarvh:b2.0.0
xarvh:b1.2.4
xarvh:b1.2.3
xarvh:b1.2.2
xarvh:b1.2.1
xarvh:b1.2.0
xarvh:b1.0.1
xarvh:1.0.0

3 commits
responsive ... develop

Author SHA1 Message Date
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
5 changed files with 20 additions and 7 deletions
Show stats Expand all files Collapse all files

4
app/Http/Controllers/ThemeController.php
View file

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

2
app/Services/Data/SortingService.php
View file

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

9
content/themes/fipamo-default-v2/archive.blade.php
View file

@ -14,14 +14,17 @@
<div role="archive-month"> <div role="archive-month">
<h3>{{ $data['full_month'] }}</h3> <h3>{{ $data['full_month'] }}</h3>
@foreach($data['pages'] as $page) @foreach($data['pages'] as $page)
@php
$title = urldecode($page['title']);
@endphp
@if(isset($dynamicRender)) @if(isset($dynamicRender))
@if($dynamicRender == 'true') @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 @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 @endif
@else @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 @endif
@endforeach @endforeach
</div> </div>

10
public/assets/css/dash/page-editor.css
View file

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

2
resources/views/frame.blade.php
View file

@ -3,7 +3,7 @@
<head> <head>
<meta charset="UTF-8"> <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="viewport" content="width=device-width, initial-scale=1">
<meta name="csrf-token" content="{{ csrf_token() }}"> <meta name="csrf-token" content="{{ csrf_token() }}">
<title> <title>