Просмотр исходного кода

Ticket #3988 - Artificer template (part 5): Move HTML templates to core.

AntonLV 4 лет назад
Родитель
Сommit
6f76ac7e3a

+ 0 - 12
modules/boonex/artificer/data/template/system/auth.html

@@ -1,12 +0,0 @@
-<div class="sys-auth-block __class_container__ grid gap-2 mb-4">
-    <bx_repeat:buttons>
-        <div class="sys-auth __class__ flex">
-            <a class="group inline-flex items-center justify-start w-full px-4 py-2 border border-gray-300 dark:border-gray-700 shadow-sm hover:shadow-md text-sm font-medium rounded-md text-gray-700 dark:text-gray-300 dark:hover:text-white hover:text-gray-800 bg-white dark:bg-gray-800 dark:hover:bg-gray-700 hover:bg-gray-50" href="__href__" <bx_if:show_onclick> onclick="__onclick__"</bx_if:show_onclick> title="__title_alt__">
-                <bx_if:show_icon>
-                    <span class="sys-auth-icon flex items-center justify-center h-5 w-5"><i class="sys-icon __icon__ sys-colored"></i></span>
-                </bx_if:show_icon>
-                <bx_if:show_title><span class="sys-auth-text ml-2 truncate">__title__</span></bx_if:show_title>
-            </a>
-        </div>
-    </bx_repeat:buttons>
-</div>

+ 0 - 17
modules/boonex/artificer/data/template/system/author.html

@@ -1,17 +0,0 @@
-<div class="sys-author-info flex justify-between items-center flex-wrap">
-    <div class="sys-author bx-def-unit absolute flex items-center">
-        <div class="bx-def-unit-img">__author_unit__</div>
-        <div class="bx-def-unit-info ml-4">
-            <div class="bx-def-unit-info-cnt bx-def-box-sizing">
-                <div class="bx-def-unit-line bx-def-font-author"><a class="bx-def-unit-info-title" href="__author_url__" title="__author_title_attr__">__author_title__</a></div>
-                <div class="bx-def-unit-line bx-def-font-meta">__author_desc__</div>
-            </div>
-        </div>
-    </div>
-    <div class="sys-author-profile py-1">__author_profile_desc__</div>
-</div>
-<bx_if:addon>
-    <div class="bx-def-margin-sec-top">
-        __content__
-    </div>
-</bx_if:addon>

+ 0 - 5
modules/boonex/artificer/data/template/system/author_desc.html

@@ -1,5 +0,0 @@
-<bx_repeat:items>
-    <span class="bx-def-ui-div bx-def-font-grayed">&nbsp;&#183;&nbsp;</span>
-    <bx_if:text><span class="bx-def-font-meta">__content__</span></bx_if:text>
-    <bx_if:link><a class="bx-def-font-meta bx-def-a-colored" href="__link__">__content__</a></bx_if:link>
-</bx_repeat:items>

+ 0 - 13
modules/boonex/artificer/data/template/system/css/auth.css

@@ -1,13 +0,0 @@
-/*--
-import url(../../../../../../../template/css/auth.css);
---*/
-
-.sys-auth.sys-auth-compact a {
-    -webkit-justify-content: center;
-    justify-content: center;
-}
-
-.sys-auth.sys-auth-compact .bx-btn {
-    margin-left: 0;
-    margin-right: 0;
-}

+ 0 - 17
modules/boonex/artificer/data/template/system/css/informer.css

@@ -1,17 +0,0 @@
-/*--
-import url(../../../../../../../template/css/informer.css);
---*/
-
-.bx-informer-icon {
-    display: none;
-    vertical-align: top;
-}
-.bx-informer-msg-info .bx-informer-icon-info {
-    display: inline-block;
-}
-.bx-informer-msg-alert .bx-informer-icon-alert {
-    display: inline-block;
-}
-.bx-informer-msg-error .bx-informer-icon-error {
-    display: inline-block;
-}

+ 0 - 20
modules/boonex/artificer/data/template/system/informer.html

@@ -1,20 +0,0 @@
-<div class="bx-def-page-width mx-auto px-4 pt-4 box-border">
-    <div id="bx-informer">
-        <bx_repeat:messages>
-            <div id="__id__" class="bx-informer-msg __class__ flex items-center mt-4 first:mt-0 p-4 rounded-md">
-                <div class="flex-none w-5 h-5">
-                    <svg class="bx-informer-icon bx-informer-icon-info text-blue-400 h-5 w-5" x-description="Heroicon name: solid/information-circle" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 20 20" fill="currentColor" aria-hidden="true">
-                        <path fill-rule="evenodd" d="M18 10a8 8 0 11-16 0 8 8 0 0116 0zm-7-4a1 1 0 11-2 0 1 1 0 012 0zM9 9a1 1 0 000 2v3a1 1 0 001 1h1a1 1 0 100-2v-3a1 1 0 00-1-1H9z" clip-rule="evenodd"></path>
-                    </svg>
-                    <svg class="bx-informer-icon bx-informer-icon-alert h-5 w-5 text-yellow-400" x-description="Heroicon name: solid/exclamation" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 20 20" fill="currentColor" aria-hidden="true">
-                        <path fill-rule="evenodd" d="M8.257 3.099c.765-1.36 2.722-1.36 3.486 0l5.58 9.92c.75 1.334-.213 2.98-1.742 2.98H4.42c-1.53 0-2.493-1.646-1.743-2.98l5.58-9.92zM11 13a1 1 0 11-2 0 1 1 0 012 0zm-1-8a1 1 0 00-1 1v3a1 1 0 002 0V6a1 1 0 00-1-1z" clip-rule="evenodd"></path>
-                    </svg>
-                    <svg class="bx-informer-icon bx-informer-icon-error h-5 w-5 text-red-400" x-description="Heroicon name: solid/x-circle" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 20 20" fill="currentColor" aria-hidden="true">
-                        <path fill-rule="evenodd" d="M10 18a8 8 0 100-16 8 8 0 000 16zM8.707 7.293a1 1 0 00-1.414 1.414L8.586 10l-1.293 1.293a1 1 0 101.414 1.414L10 11.414l1.293 1.293a1 1 0 001.414-1.414L11.414 10l1.293-1.293a1 1 0 00-1.414-1.414L10 8.586 8.707 7.293z" clip-rule="evenodd"></path>
-                    </svg>
-                </div>
-                <div class="ml-3 text-sm">__msg__</div>
-            </div>
-        </bx_repeat:messages>
-    </div>
-</div>

+ 1 - 5
modules/boonex/decorous/data/template/system/css/auth.css

@@ -1,5 +1 @@
-@import url(../../../../../../../template/css/auth.css);
-
-.sys-auth .bx-btn {
-    border: none !important;
-}
+@import url(../../../../../../../template/css/auth.css);

+ 4 - 4
plugins_public/tailwind/css/tailwind.css

@@ -1006,16 +1006,16 @@
 
 
     /* Common elements: Informers */
-    .bx-artificer .bx-informer-msg a {
+    .bx-informer-msg a {
         @apply text-blue-600 hover:text-blue-700 dark:text-blue-500 dark:hover:text-blue-600;
     }
-    .bx-artificer .bx-informer-msg-info {
+    .bx-informer-msg-info {
         @apply bg-blue-50 text-blue-700;
     }
-    .bx-artificer .bx-informer-msg-alert {
+    .bx-informer-msg-alert {
         @apply bg-yellow-50 text-yellow-700;
     }
-    .bx-artificer .bx-informer-msg-error {
+    .bx-informer-msg-error {
         @apply bg-red-50 text-red-700;
     }
 

Разница между файлами не показана из-за своего большого размера
+ 0 - 0
plugins_public/tailwind/css/tailwind.min.css


+ 7 - 5
template/auth.html

@@ -1,9 +1,11 @@
-<div class="sys-auth-block bx-def-margin-bottom __class_container__">
+<div class="sys-auth-block __class_container__ grid gap-2 mb-4">
     <bx_repeat:buttons>
-        <div class="sys-auth __class__ bx-def-margin-sec-right bx-def-margin-sec-bottom bx-def-box-sizing bx-clearfix">
-            <a class="bx-btn" href="__href__"
-                <bx_if:show_onclick> onclick="__onclick__"</bx_if:show_onclick> title="__title_alt__">
-                <bx_if:show_icon><i class="sys-icon __icon__ sys-colored"></i></bx_if:show_icon><bx_if:show_title><u>__title__</u></bx_if:show_title>
+        <div class="sys-auth __class__ flex">
+            <a class="group inline-flex items-center justify-start w-full px-4 py-2 border border-gray-300 dark:border-gray-700 shadow-sm hover:shadow-md text-sm font-medium rounded-md text-gray-700 dark:text-gray-300 dark:hover:text-white hover:text-gray-800 bg-white dark:bg-gray-800 dark:hover:bg-gray-700 hover:bg-gray-50" href="__href__" <bx_if:show_onclick> onclick="__onclick__"</bx_if:show_onclick> title="__title_alt__">
+                <bx_if:show_icon>
+                    <span class="sys-auth-icon flex items-center justify-center h-5 w-5"><i class="sys-icon __icon__ sys-colored"></i></span>
+                </bx_if:show_icon>
+                <bx_if:show_title><span class="sys-auth-text ml-2 truncate">__title__</span></bx_if:show_title>
             </a>
         </div>
     </bx_repeat:buttons>

+ 7 - 7
template/author.html

@@ -1,14 +1,14 @@
-<div class="sys-author-info">
-    <div class="sys-author bx-def-unit absolute">
-        <div class="bx-def-unit-img">__author_unit__</div>
-        <div class="bx-def-unit-info bx-def-ui-cols bx-def-thumb-size-min-height bx-def-thumb-size-max-height bx-def-thumb-size-left-indent">
+<div class="sys-author-info flex justify-between items-center flex-wrap">
+    <div class="sys-author bx-def-unit flex items-center">
+        <div class="bx-def-unit-img flex-none">__author_unit__</div>
+        <div class="bx-def-unit-info flex-auto min-w-0 ml-4">
             <div class="bx-def-unit-info-cnt bx-def-box-sizing">
-                <div class="bx-def-unit-line"><a class="bx-def-unit-info-title" href="__author_url__" title="__author_title_attr__">__author_title__</a></div>
-                <div class="bx-def-unit-line bx-def-font-grayed bx-def-font-small">__author_desc__</div>
+                <div class="bx-def-unit-line bx-def-font-author"><a class="bx-def-unit-info-title" href="__author_url__" title="__author_title_attr__">__author_title__</a></div>
+                <div class="bx-def-unit-line bx-def-font-meta">__author_desc__</div>
             </div>
         </div>
     </div>
-    <div class="sys-author-profile bx-def-margin-thd-topbottom">__author_profile_desc__</div>
+    <div class="sys-author-profile py-1">__author_profile_desc__</div>
 </div>
 <bx_if:addon>
     <div class="bx-def-margin-sec-top">

+ 1 - 1
template/author_desc.html

@@ -1,5 +1,5 @@
 <bx_repeat:items>
     <span class="bx-def-ui-div bx-def-font-grayed">&nbsp;&#183;&nbsp;</span>
     <bx_if:text><span class="bx-def-font-meta">__content__</span></bx_if:text>
-    <bx_if:link><a class="bx-def-font-meta" href="__link__">__content__</a></bx_if:link>
+    <bx_if:link><a class="bx-def-font-meta bx-def-a-colored" href="__link__">__content__</a></bx_if:link>
 </bx_repeat:items>

+ 7 - 45
template/css/auth.css

@@ -1,47 +1,9 @@
-.sys-auth-block {
-    display: flex;
-    flex-wrap: wrap;
-    justify-content: space-between;
-    align-content: space-between;
+.sys-auth.sys-auth-compact a {
+    -webkit-justify-content: center;
+    justify-content: center;
 }
 
-.sys-auth-block.sys-auth-compact-container {
-    justify-content:flex-start;
-}
-
-.sys-auth-block .sys-auth:not(.sys-auth-compact) {
-    width: 47%;
-}
-
-.sys-auth .bx-btn {
-    float: none;
-    width: 100%;
-    text-align: left;
-    font-weight:normal;
-    white-space: nowrap;
-    text-overflow: ellipsis;
-    overflow: hidden;
-    color: #fff;
-    height: 3rem;
-    line-height: 3rem;
-    border-radius:4px;
-    border:none;
-}
-
-.sys-auth .bx-btn .sys-icon {
-    color: #fff;
-    font-size: 1.25rem;
-}
-
-.sys-auth .bx-btn u {
-    display: inline;
-}
-
-.sys-auth-compact {
-	position: relative;
-	display: inline-block;
-}
-
-.sys-auth-compact .bx-btn {
-	width: auto;
-}
+.sys-auth.sys-auth-compact .bx-btn {
+    margin-left: 0;
+    margin-right: 0;
+}

+ 12 - 10
template/css/default.less

@@ -571,12 +571,22 @@ h3,
     .margin-left(@bx-size-icon + @bx-margin);
 }
 
+/*--- Unit ---*/
 .bx-def-unit {
     position:relative;
     white-space:nowrap;
 }
+.bx-def-unit-info {
+    .box-sizing(border-box);
+
+    text-overflow:ellipsis;
+    overflow:hidden;
+}
+.bx-def-unit .bx-def-unit-line .bx-def-ui-div:first-child {
+    display: none;
+}
 
-/*-- Tailwind overwrite --*/
+/*-- Unit: Tailwind overwrite --*/
 .bx-def-unit.absolute {
     position: relative;
 }
@@ -594,20 +604,12 @@ h3,
 .bx-def-unit.absolute .bx-def-unit-info-cnt {
     width: 100%;
 }
-.bx-def-unit-info {
-    .box-sizing(border-box);
-
-    text-overflow:ellipsis;
-    overflow:hidden;
-}
 .bx-def-unit.absolute .bx-def-unit-line {
     text-overflow:ellipsis;
     overflow:hidden;
 }
-.bx-def-unit.absolute .bx-def-unit-line .bx-def-ui-div:first-child {
-    display: none;
-}
 
+/*--- Alerts ---*/
 .bx-def-unit-alert,
 .bx-def-unit-alert-small,
 .bx-def-unit-alert-middle {

+ 0 - 14
template/css/general.css

@@ -538,16 +538,6 @@ div.bx-account-unit-online {
 
 
 /* --------------- Author Info */
-.sys-author-info {
-    display: -webkit-flex;
-    display: flex;
-    -webkit-align-items: center;
-    align-items: center;
-    -webkit-justify-content: space-between;
-    justify-content: space-between;
-    -webkit-flex-wrap: wrap;
-    flex-wrap: wrap;
-}
 .sys-author-profile ul.bx-menu-custom.bx-menu-custom-hor {
     webkit-align-items: center;
     align-items: center;
@@ -566,10 +556,6 @@ div.bx-account-unit-online {
     padding: 0.25rem;
     white-space: nowrap;
 }
-.sys-author-profile .bx-menu-custom.bx-menu-custom-hor > li > span.bx-base-profile-unit-meta-item.bx-def-padding-thd-leftright {
-    padding-left: 0;
-    padding-right: 0.5rem;
-}
 .sys-author-profile .bx-menu-custom.bx-menu-custom-hor > li:first-child .bx-base-general-unit-meta-div {
     display: none;
 }

+ 10 - 24
template/css/informer.css

@@ -2,30 +2,16 @@
 .bx-informer-msg:first-child {
     margin-top:0;
 }
-
-.bx-informer-msg-info {
-    background-color: rgb(220, 220, 255);
-    background-color: rgba(180, 180, 255, 0.4);
-
-    -moz-box-shadow: inset 0px 0px -1px 0px rgba(180, 180, 255, 0.4);
-    -webkit-box-shadow: inset 0px 0px -1px 0px rgba(180, 180, 255, 0.4);
-    box-shadow: inset 0px 0px -1px 0px rgba(180, 180, 255, 0.4);
+.bx-informer-icon {
+    display: none;
+    vertical-align: top;
 }
-
-.bx-informer-msg-alert {
-    background-color: rgb(255, 244, 213);
-    background-color: rgba(255, 234, 193, 0.5);
-
-    -moz-box-shadow: inset 0px 0px -1px 0px rgba(255, 234, 193, 0.5);
-    -webkit-box-shadow: inset 0px 0px -1px 0px rgba(255, 234, 193, 0.5);
-    box-shadow: inset 0px 0px -1px 0px rgba(255, 234, 193, 0.5);
+.bx-informer-msg-info .bx-informer-icon-info {
+    display: inline-block;
 }
-
-.bx-informer-msg-error {
-    background-color: rgb(255, 200, 200);
-    background-color: rgba(255, 180, 180, 0.5);
-
-    -moz-box-shadow: inset 0px 0px -1px 0px rgba(255, 180, 180, 0.5);
-    -webkit-box-shadow: inset 0px 0px -1px 0px rgba(255, 180, 180, 0.5);
-    box-shadow: inset 0px 0px -1px 0px rgba(255, 180, 180, 0.5);
+.bx-informer-msg-alert .bx-informer-icon-alert {
+    display: inline-block;
+}
+.bx-informer-msg-error .bx-informer-icon-error {
+    display: inline-block;
 }

+ 16 - 5
template/informer.html

@@ -1,9 +1,20 @@
-<div class="bx-def-centered bx-def-padding-sec-leftright bx-def-page-width bx-def-box-sizing">
-    <div id="bx-informer" class="bx-def-margin-top bx-def-padding-sec-leftright">
+<div class="bx-def-page-width mx-auto px-4 pt-4 box-border">
+    <div id="bx-informer">
         <bx_repeat:messages>
-            <div id="__id__" class="bx-informer-msg __class__ bx-def-padding bx-def-round-corners bx-def-margin-top">
-                __msg__
+            <div id="__id__" class="bx-informer-msg __class__ flex items-center mt-4 first:mt-0 p-4 rounded-md">
+                <div class="flex-none w-5 h-5">
+                    <svg class="bx-informer-icon bx-informer-icon-info text-blue-400 h-5 w-5" x-description="Heroicon name: solid/information-circle" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 20 20" fill="currentColor" aria-hidden="true">
+                        <path fill-rule="evenodd" d="M18 10a8 8 0 11-16 0 8 8 0 0116 0zm-7-4a1 1 0 11-2 0 1 1 0 012 0zM9 9a1 1 0 000 2v3a1 1 0 001 1h1a1 1 0 100-2v-3a1 1 0 00-1-1H9z" clip-rule="evenodd"></path>
+                    </svg>
+                    <svg class="bx-informer-icon bx-informer-icon-alert h-5 w-5 text-yellow-400" x-description="Heroicon name: solid/exclamation" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 20 20" fill="currentColor" aria-hidden="true">
+                        <path fill-rule="evenodd" d="M8.257 3.099c.765-1.36 2.722-1.36 3.486 0l5.58 9.92c.75 1.334-.213 2.98-1.742 2.98H4.42c-1.53 0-2.493-1.646-1.743-2.98l5.58-9.92zM11 13a1 1 0 11-2 0 1 1 0 012 0zm-1-8a1 1 0 00-1 1v3a1 1 0 002 0V6a1 1 0 00-1-1z" clip-rule="evenodd"></path>
+                    </svg>
+                    <svg class="bx-informer-icon bx-informer-icon-error h-5 w-5 text-red-400" x-description="Heroicon name: solid/x-circle" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 20 20" fill="currentColor" aria-hidden="true">
+                        <path fill-rule="evenodd" d="M10 18a8 8 0 100-16 8 8 0 000 16zM8.707 7.293a1 1 0 00-1.414 1.414L8.586 10l-1.293 1.293a1 1 0 101.414 1.414L10 11.414l1.293 1.293a1 1 0 001.414-1.414L11.414 10l1.293-1.293a1 1 0 00-1.414-1.414L10 8.586 8.707 7.293z" clip-rule="evenodd"></path>
+                    </svg>
+                </div>
+                <div class="ml-3 text-sm">__msg__</div>
             </div>
         </bx_repeat:messages>
     </div>
-</div>
+</div>

Некоторые файлы не были показаны из-за большого количества измененных файлов