@raketa-cloud/admin 1.8.21 → 1.8.22

package/dist/application.css

@@ -2359,10 +2359,6 @@ select {
   padding-top: 0.25rem;
 }
 
-.pt-2 {
-  padding-top: 0.5rem;
-}
-
 .pt-6 {
   padding-top: 1.5rem;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@raketa-cloud/admin",
-  "version": "1.8.21",
+  "version": "1.8.22",
   "main": "src/index.js",
   "files": [
     "src/",

package/src/views/resources/_shared/_title.ejs

@@ -1,18 +1,14 @@
-<div class="flex justify-between w-full pb-8">
-  <div class="flex flex-col">
-    <h1 class="flex items-center gap-2 heading-1">
-      <%= resource.title %>
-    </h1>
-    <a href="<%= _context.remoteConfig.resourceUrl(resource, _context.resourceConfig.resourceType, _context.locale) %>" target="_blank" class="btn-text"><%= _context.remoteConfig.resourceUrl(resource, _context.resourceConfig.resourceType, _context.locale) %></a>
-  </div>
+<div class="flex flex-col pb-4">
+  <h1 class="heading-1 flex items-center gap-2">
+    <%= resource.title %>
 
-  <%
-    const withTranslations = locals.withTranslations && locals.render_partial;
-  %>
-
-  <% if (withTranslations) { %>
-  <div class="pt-2">
-    <%- render_partial('./_shared/_translations_strip.ejs') %>
-  </div>
-  <% } %>
+    <% if (resource.visibility !== "private") { %>
+    <a href="<%= _context.remoteConfig.resourceUrl(resource, _context.resourceConfig.resourceType, _context.locale) %>" target="_blank">
+      <svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke-width="1.5" stroke="currentColor" class="size-6 text-raketa-primary">
+        <path stroke-linecap="round" stroke-linejoin="round" d="M13.5 6H5.25A2.25 2.25 0 0 0 3 8.25v10.5A2.25 2.25 0 0 0 5.25 21h10.5A2.25 2.25 0 0 0 18 18.75V10.5m-10.5 6L21 3m0 0h-5.25M21 3v5.25" />
+      </svg>
+    </a>
+    <% } %>
+  </h1>
+  <a href="<%= _context.remoteConfig.resourceUrl(resource, _context.resourceConfig.resourceType, _context.locale) %>" target="_blank" class="btn-text"><%= _context.remoteConfig.resourceUrl(resource, _context.resourceConfig.resourceType, _context.locale) %></a>
 </div>

package/src/views/resources/_shared/_toolbar.ejs

@@ -5,17 +5,21 @@
       !resource.activeContentTask.completedAt &&
       !resource.activeContentTask.failedAt;
   %>
-  <% if (_context.query?.revisions_count_error) { %>
-  <div class="text-red-600">Cannot open a new revision. Current limit is <%= _context.maxOpenRevisions %>. </div>
-  <% } %>
-
-  <% if (hasActiveContentTask) { %>
-  <div class="mt-2 text-orange-700 dark:text-orange-300">Actions are disabled while a translation task is in progress.</div>
-  <% } %>
-
   <div class="actions-toolbar">
+    <form method="POST" action="<%= `/${_context.locale}/${_context.resourceConfig.resourceTypePlural}/${resource.id}/${_context.resourceConfig.resourceType}_revisions` %>" class="inline-block">
+      <% if (resource.revisionsCount >= _context?.maxOpenRevisions || hasActiveContentTask) { %>
+      <button type="submit" class="btn-primary" disabled style="opacity: 50%;">
+        Start revision
+      </button>
+      <% } else {%>
+      <button type="submit" class="btn-primary">
+        Start revision
+      </button>
+      <% } %>
+    </form>
+
     <% if (hasActiveContentTask) { %>
-    <button type="button" class="btn-secondary has-icon" disabled style="opacity: 50%; cursor: not-allowed;">
+    <button type="button" class="btn-text has-icon" disabled style="opacity: 50%; cursor: not-allowed;">
       <svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke-width="1.5" stroke="currentColor" class="size-4">
         <path stroke-linecap="round" stroke-linejoin="round" d="M13.19 8.688a4.5 4.5 0 0 1 1.242 7.244l-4.5 4.5a4.5 4.5 0 0 1-6.364-6.364l1.757-1.757m13.35-.622 1.757-1.757a4.5 4.5 0 0 0-6.364-6.364l-4.5 4.5a4.5 4.5 0 0 0 1.242 7.244" />
       </svg>
@@ -23,7 +27,7 @@
       Change URL
     </button>
     <% } else { %>
-    <a href="<%= `/${_context.locale}/${_context.resourceConfig.resourceTypePlural}/${resource.id}/urls/new` %>" class="btn-secondary has-icon">
+    <a href="<%= `/${_context.locale}/${_context.resourceConfig.resourceTypePlural}/${resource.id}/urls/new` %>" class="btn-text has-icon">
       <svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke-width="1.5" stroke="currentColor" class="size-4">
         <path stroke-linecap="round" stroke-linejoin="round" d="M13.19 8.688a4.5 4.5 0 0 1 1.242 7.244l-4.5 4.5a4.5 4.5 0 0 1-6.364-6.364l1.757-1.757m13.35-.622 1.757-1.757a4.5 4.5 0 0 0-6.364-6.364l-4.5 4.5a4.5 4.5 0 0 0 1.242 7.244" />
       </svg>
@@ -33,7 +37,7 @@
     <% } %>
 
     <form action="<%= `/${_context.locale}/${_context.resourceConfig.resourceTypePlural}/${resource.id}/clones` %>" method="post" class="inline-block">
-      <button type="submit" class="btn-secondary has-icon" <%= hasActiveContentTask ? 'disabled style="opacity: 50%;"' : '' %>>
+      <button type="submit" class="btn-text has-icon" <%= hasActiveContentTask ? 'disabled style="opacity: 50%;"' : '' %>>
         <svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke-width="1.5" stroke="currentColor" class="size-4">
           <path stroke-linecap="round" stroke-linejoin="round" d="M15.75 17.25v3.375c0 .621-.504 1.125-1.125 1.125h-9.75a1.125 1.125 0 0 1-1.125-1.125V7.875c0-.621.504-1.125 1.125-1.125H6.75a9.06 9.06 0 0 1 1.5.124m7.5 10.376h3.375c.621 0 1.125-.504 1.125-1.125V11.25c0-4.46-3.243-8.161-7.5-8.876a9.06 9.06 0 0 0-1.5-.124H9.375c-.621 0-1.125.504-1.125 1.125v3.5m7.5 10.375H9.375a1.125 1.125 0 0 1-1.125-1.125v-9.25m12 6.625v-1.875a3.375 3.375 0 0 0-3.375-3.375h-1.5a1.125 1.125 0 0 1-1.125-1.125v-1.5a3.375 3.375 0 0 0-3.375-3.375H9.75" />
         </svg>
@@ -61,5 +65,11 @@
     <% } %>
   </div>
 
+  <% if (_context.query?.revisions_count_error) { %>
+  <div class="text-red-600">Cannot open a new revision. Current limit is <%= _context.maxOpenRevisions %>. </div>
+  <% } %>
 
+  <% if (hasActiveContentTask) { %>
+  <div class="text-orange-700 mt-2 dark:text-orange-300">Actions are disabled while a translation task is in progress.</div>
+  <% } %>
 </div>

package/src/views/resources/_shared/_translations_strip.ejs

@@ -1,4 +1,4 @@
-<div class="flex flex-wrap items-center gap-1">
+<div class="flex flex-wrap items-center gap-1 pb-8">
   <%
       const availableLocales = Object.keys(_context.locales);
       const totalPossibleTranslations = availableLocales.length - 1;

package/src/views/resources/show.ejs

@@ -1,8 +1,11 @@
 <div class="page-wrapper">
   <div class="page-title">
-    <%- render_partial('./_shared/_title.ejs', { withTranslations: true, render_partial }) %>
+    <%- render_partial('./_shared/_title.ejs') %>
+    <%- render_partial('./_shared/_toolbar.ejs') %>
   </div>
 
+  <%- render_partial('./_shared/_translations_strip.ejs') %>
+
   <%
     const openedRevisions = []
     const scheduledRevisions = []
@@ -40,23 +43,6 @@
       resource.revisionsCount >= _context?.maxOpenRevisions;
     const canStartRevision = !atRevisionLimit && !hasActiveContentTask;
   %>
-
-    <div class="pb-4">
-      <% if (_context.query?.revisions_count_error) { %>
-      <div class="text-red-600">Cannot open a new revision. Current limit is <%= _context.maxOpenRevisions %>. </div>
-      <% } %>
-
-      <% if (hasActiveContentTask) { %>
-      <div class="mb-2 text-orange-700 dark:text-orange-300">Actions are disabled while a translation task is in progress.</div>
-      <% } %>
-
-      <form method="POST" action="<%= `/${_context.locale}/${_context.resourceConfig.resourceTypePlural}/${resource.id}/${_context.resourceConfig.resourceType}_revisions` %>" class="inline-block">
-        <button type="submit" class="btn-primary" <%- canStartRevision ? '' : 'disabled style="opacity: 50%;"' %> <% if (atRevisionLimit && !hasActiveContentTask) { %> title="Open revision limit reached (<%= _context.maxOpenRevisions %>)" <% } %>>
-          Start revision
-        </button>
-      </form>
-    </div>
-
     <% if (openedRevisions.length) { %>
     <table class="data-grid alt">
       <thead>
@@ -173,20 +159,6 @@
       Full page history
     </a>
   </div>
-
-
-  <div class="pb-8">
-
-    <h4 class="flex items-center gap-2 pb-4 heading-3">
-      <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="currentColor" class="size-5 text-raketa-primary">
-        <path fill-rule="evenodd" clip-rule="evenodd" d="M9.594 3.94c.09-.542.56-.94 1.11-.94h2.593c.55 0 1.02.398 1.11.94l.213 1.281c.063.374.313.686.645.87.074.04.147.083.22.127.325.196.72.257 1.075.124l1.217-.456a1.125 1.125 0 0 1 1.37.49l1.296 2.247a1.125 1.125 0 0 1-.26 1.431l-1.003.827c-.293.241-.438.613-.43.992a7.723 7.723 0 0 1 0 .255c-.008.378.137.75.43.991l1.004.827c.424.35.534.955.26 1.43l-1.298 2.247a1.125 1.125 0 0 1-1.369.491l-1.217-.456c-.355-.133-.75-.072-1.076.124a6.47 6.47 0 0 1-.22.128c-.331.183-.581.495-.644.869l-.213 1.281c-.09.543-.56.94-1.11.94h-2.594c-.55 0-1.019-.398-1.11-.94l-.213-1.281c-.062-.374-.312-.686-.644-.87a6.52 6.52 0 0 1-.22-.127c-.325-.196-.72-.257-1.076-.124l-1.217.456a1.125 1.125 0 0 1-1.369-.49l-1.297-2.247a1.125 1.125 0 0 1 .26-1.431l1.004-.827c.292-.24.437-.613.43-.991a6.932 6.932 0 0 1 0-.255c.007-.38-.138-.751-.43-.992l-1.004-.827a1.125 1.125 0 0 1-.26-1.43l1.297-2.247a1.125 1.125 0 0 1 1.37-.491l1.216.456c.356.133.751.072 1.076-.124.072-.044.146-.086.22-.128.332-.183.582-.495.644-.869l.214-1.28ZM15 12a3 3 0 1 1-6 0 3 3 0 0 1 6 0Z" />
-      </svg>
-
-      Actions
-    </h4>
-
-    <%- render_partial('./_shared/_toolbar.ejs') %>
-  </div>
 </div>
 
 <% if (reports.path) { %>