Skip to content

pat-contentbrowser: Fixed preview and upload column width #1422

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
petschki merged 1 commit into from
Jan 28, 2025
Merged

pat-contentbrowser: Fixed preview and upload column width #1422

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions src/pat/contentbrowser/contentbrowser.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,8 @@ parser.addArgument(
"getIcon",
"is_folderish",
"review_state",
"created",
"modified",
], null, true
);
parser.addArgument("width");
Expand Down
59 changes: 48 additions & 11 deletions src/pat/contentbrowser/src/ContentBrowser.svelte
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
import contentStore from "./ContentStore";
import {
clickOutside,
formatDate,
get_items_from_uids,
request,
resolveIcon,
Expand Down Expand Up @@ -67,6 +68,7 @@

async function upload() {
updatePreview({ action: "clear" });
scrollToRight();
showUpload = true;
await utils.timeout(1);
const uploadEl = document.querySelector(".upload-wrapper");
Expand Down Expand Up @@ -182,7 +184,10 @@
...document.querySelectorAll(".levelColumn .inPath"), // previously selected folder
...document.querySelectorAll(".levelColumn .selectedItem"), // previously selected item
];
if(!possibleFocusEls.length && document.querySelector(".levelColumn .contentItem")) {
if (
!possibleFocusEls.length &&
document.querySelector(".levelColumn .contentItem")
) {
possibleFocusEls.push(document.querySelector(".levelColumn .contentItem"));
}
if (possibleFocusEls.length) {
Expand Down Expand Up @@ -426,7 +431,7 @@
{#if level.selectable}
<button
class="btn btn-primary btn-xs"
title="{level.displayPath}"
title={level.displayPath}
disabled={!isSelectable(level)}
on:click|preventDefault={() => addItem(level)}
>
Expand Down Expand Up @@ -505,7 +510,9 @@
/>
{item.Title}
{#if $config.mode == "search"}
<br><span class="small">{item.path}</span>
<br /><span class="small"
>{item.path}</span
>
{/if}
</div>
{/if}
Expand Down Expand Up @@ -568,8 +575,39 @@
/>
</div>
{/if}
<h4>{previewItem.Title}</h4>
<p>{previewItem.Description}</p>
<dl>
<dt>{_t("Title")}</dt>
<dd>{previewItem.Title}</dd>
{#if previewItem.Description}
<dt>{_t("Description")}</dt>
<dd
class="text-truncate"
title={previewItem.Description}
>
{previewItem.Description}
</dd>
{/if}
{#if previewItem.created}
<dt>{_t("created")}</dt>
<dd>
<time datetime={previewItem.created}
>{formatDate(previewItem.created)}</time
>
</dd>
{/if}
{#if previewItem.modified}
<dt>{_t("modified")}</dt>
<dd>
<time datetime={previewItem.modified}
>{formatDate(previewItem.modified)}</time
>
</dd>
{/if}
{#if previewItem.review_state}
<dt>{_t("review_state")}</dt>
<dd>{previewItem.review_state}</dd>
{/if}
</dl>
</div>
</div>
{/if}
Expand Down Expand Up @@ -672,7 +710,7 @@
.levelToolbar > .levelActions {
margin-left: auto;
}
.levelToolbar > button{
.levelToolbar > button {
white-space: nowrap;
overflow: hidden;
text-overflow: ellipsis;
Expand All @@ -693,7 +731,7 @@
outline: none;
}
.contentItem.even {
background-color: rgba(var(--bs-secondary-bg-rgb), .4);
background-color: rgba(var(--bs-secondary-bg-rgb), 0.4);
}
.contentItem.inPath,
.contentItem:focus {
Expand Down Expand Up @@ -726,6 +764,7 @@
min-height: 300px;
display: flex;
flex-direction: column;
flex-shrink: 0;
align-items: center;
}
.preview .info {
Expand All @@ -740,9 +779,6 @@
width: 50px !important;
height: 50px !important;
}
.preview h4 {
font-size: 1.2 rem;
}
.preview img {
max-width: 100%;
max-width: 100%;
Expand All @@ -751,8 +787,9 @@

.upload-wrapper {
padding: 1rem;
width: 590px;
width: 540px;
overflow-x: auto;
flex-shrink: 0;
}
.loadmore {
text-align: center;
Expand Down
8 changes: 8 additions & 0 deletions src/pat/contentbrowser/src/utils.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import utils from "../../../core/utils.js";
import I18n from "../../../core/i18n.js";

export async function request({
method = "GET",
Expand Down Expand Up @@ -212,3 +213,10 @@ export function updateRecentlyUsed(item, config) {
recentlyUsed.push(item);
utils.storage.set(config.recentlyUsedKey, recentlyUsed);
}


export function formatDate(dateval) {
const d = Date.parse(dateval);
const i18n = new I18n();
return new Date(d).toLocaleString(i18n.currentLanguage);
}