From 49cebd40502ee142e4c82deccee4ba4f94c62208 Mon Sep 17 00:00:00 2001 From: Tony Air Date: Thu, 14 Jan 2021 23:56:34 +0700 Subject: [PATCH] IMPR: Minor classes updates --- .../SilverStripe/Blog/Includes/BlogPostInfo.ss | 12 ++++++------ .../SilverStripe/Blog/Includes/EntryMeta.ss | 18 +++++++++--------- .../SilverStripe/Blog/Model/Layout/Blog.ss | 4 ++-- .../SilverStripe/Blog/Model/Layout/BlogPost.ss | 4 ++-- .../Blog/Widgets/BlogArchiveWidget.ss | 2 ++ .../Blog/Widgets/BlogCategoriesWidget.ss | 2 ++ .../Blog/Widgets/BlogFeaturedPostsWidget.ss | 2 ++ .../Blog/Widgets/BlogRecentPostsWidget.ss | 2 ++ .../Blog/Widgets/BlogTagsCloudWidget.ss | 2 ++ .../Blog/Widgets/BlogTagsWidget.ss | 2 ++ .../SilverStripe/Forms/PasswordField.ss | 3 ++- ...nedFormController_ReceivedFormSubmission.ss | 4 ++-- 12 files changed, 35 insertions(+), 22 deletions(-) diff --git a/app/templates/SilverStripe/Blog/Includes/BlogPostInfo.ss b/app/templates/SilverStripe/Blog/Includes/BlogPostInfo.ss index 9847d1e..e15b7af 100644 --- a/app/templates/SilverStripe/Blog/Includes/BlogPostInfo.ss +++ b/app/templates/SilverStripe/Blog/Includes/BlogPostInfo.ss @@ -1,4 +1,4 @@ -
+
<%-- div class="published-date">
$PublishDate.Format("d")
@@ -6,22 +6,22 @@
<% if $FeaturedImage %> -
+
$FeaturedImage.FocusFill(350,200)
<% end_if %>
-
-

+
+

$Title

-
+
$Summary
- + <%t SilverStripe\\Blog\\Model\\Blog.READMORE "Read More" %> » diff --git a/app/templates/SilverStripe/Blog/Includes/EntryMeta.ss b/app/templates/SilverStripe/Blog/Includes/EntryMeta.ss index dd6c550..2a248ed 100644 --- a/app/templates/SilverStripe/Blog/Includes/EntryMeta.ss +++ b/app/templates/SilverStripe/Blog/Includes/EntryMeta.ss @@ -1,6 +1,6 @@ -
+
<% if $Categories.exists %> -
+
<%t SilverStripe\\Blog\\Model\\Blog.PostedIn "Posted in" %> <% loop $Categories %> $Title<% if not Last %>, <% else %>;<% end_if %> @@ -9,7 +9,7 @@ <% end_if %> <% if $Tags.exists %> -
+
<%t SilverStripe\\Blog\\Model\\Blog.Tagged "Tagged" %> <% loop $Tags %> $Title<% if not Last %>, <% else %>;<% end_if %> @@ -17,36 +17,36 @@
<% end_if %> -
+
<%t SilverStripe\\Blog\\Model\\Blog.Posted "Posted" %> $PublishDate.ago
<% if $Credits %> -
+
<%t SilverStripe\\Blog\\Model\\Blog.By "by" %> <% loop $Credits %> <% if not $First && not $Last %>, <% end_if %> <% if not $First && $Last %> <%t SilverStripe\\Blog\\Model\\Blog.AND "and" %> <% end_if %> <% if $URLSegment && not $Up.ProfilesDisabled %> - $Name.XML + $Name.XML <% else %> - $Name.XML + $Name.XML <% end_if %> <% end_loop %>
<% end_if %> <% if $Comments.exists %> - + $Comments.count <%t SilverStripe\\Blog\\Model\\Blog.Comments "comments" %> <% end_if %> <% if $MinutesToRead %> -
+
<% if $MinutesToRead < 1 %> <%t SilverStripe\\Blog\\Model\\Blog.LessThanAMinuteToRead "Less than a minute to read" %> <% else %> diff --git a/app/templates/SilverStripe/Blog/Model/Layout/Blog.ss b/app/templates/SilverStripe/Blog/Model/Layout/Blog.ss index 2abf711..4811b71 100644 --- a/app/templates/SilverStripe/Blog/Model/Layout/Blog.ss +++ b/app/templates/SilverStripe/Blog/Model/Layout/Blog.ss @@ -42,7 +42,7 @@ <% else %>
-

+

<%t SilverStripe\\Blog\\Model\\Blog.NoPosts 'There are no posts' %>

@@ -58,7 +58,7 @@
<% if $CommentsForm %> -
+
$CommentsForm
diff --git a/app/templates/SilverStripe/Blog/Model/Layout/BlogPost.ss b/app/templates/SilverStripe/Blog/Model/Layout/BlogPost.ss index 3abab5c..0e2c90f 100644 --- a/app/templates/SilverStripe/Blog/Model/Layout/BlogPost.ss +++ b/app/templates/SilverStripe/Blog/Model/Layout/BlogPost.ss @@ -1,5 +1,5 @@
-
+
<%-- if $FeaturedImage %>
<% if $CommentsForm %> -
+
$CommentsForm
diff --git a/app/templates/SilverStripe/Blog/Widgets/BlogArchiveWidget.ss b/app/templates/SilverStripe/Blog/Widgets/BlogArchiveWidget.ss index d2deac2..60f430b 100644 --- a/app/templates/SilverStripe/Blog/Widgets/BlogArchiveWidget.ss +++ b/app/templates/SilverStripe/Blog/Widgets/BlogArchiveWidget.ss @@ -1,4 +1,5 @@ <% if $Archive %> +
    <% loop $Archive %>
  • @@ -8,4 +9,5 @@
    • <% end_loop %>
+
<% end_if %> diff --git a/app/templates/SilverStripe/Blog/Widgets/BlogCategoriesWidget.ss b/app/templates/SilverStripe/Blog/Widgets/BlogCategoriesWidget.ss index df33959..e2b4490 100644 --- a/app/templates/SilverStripe/Blog/Widgets/BlogCategoriesWidget.ss +++ b/app/templates/SilverStripe/Blog/Widgets/BlogCategoriesWidget.ss @@ -1,4 +1,5 @@ <% if $Categories %> +
    <% loop $Categories %>
  • @@ -8,4 +9,5 @@
    • <% end_loop %>
+
<% end_if %> diff --git a/app/templates/SilverStripe/Blog/Widgets/BlogFeaturedPostsWidget.ss b/app/templates/SilverStripe/Blog/Widgets/BlogFeaturedPostsWidget.ss index e195ad6..d5cb307 100644 --- a/app/templates/SilverStripe/Blog/Widgets/BlogFeaturedPostsWidget.ss +++ b/app/templates/SilverStripe/Blog/Widgets/BlogFeaturedPostsWidget.ss @@ -1,4 +1,5 @@ <% if $Posts %> +
    <% loop $Posts %>
  • @@ -9,4 +10,5 @@
    • <% end_loop %>
+
<% end_if %> diff --git a/app/templates/SilverStripe/Blog/Widgets/BlogRecentPostsWidget.ss b/app/templates/SilverStripe/Blog/Widgets/BlogRecentPostsWidget.ss index dbff131..42acf8d 100644 --- a/app/templates/SilverStripe/Blog/Widgets/BlogRecentPostsWidget.ss +++ b/app/templates/SilverStripe/Blog/Widgets/BlogRecentPostsWidget.ss @@ -1,4 +1,5 @@ <% if $Posts %> +
    <% loop $Posts %>
  • @@ -8,4 +9,5 @@
    • <% end_loop %>
+
<% end_if %> diff --git a/app/templates/SilverStripe/Blog/Widgets/BlogTagsCloudWidget.ss b/app/templates/SilverStripe/Blog/Widgets/BlogTagsCloudWidget.ss index 5447159..1115152 100644 --- a/app/templates/SilverStripe/Blog/Widgets/BlogTagsCloudWidget.ss +++ b/app/templates/SilverStripe/Blog/Widgets/BlogTagsCloudWidget.ss @@ -1,4 +1,5 @@ <% if $Tags %> +
    <% loop $Tags %>
  • @@ -8,4 +9,5 @@
    • <% end_loop %>
+
<% end_if %> diff --git a/app/templates/SilverStripe/Blog/Widgets/BlogTagsWidget.ss b/app/templates/SilverStripe/Blog/Widgets/BlogTagsWidget.ss index 53492f2..b09a581 100644 --- a/app/templates/SilverStripe/Blog/Widgets/BlogTagsWidget.ss +++ b/app/templates/SilverStripe/Blog/Widgets/BlogTagsWidget.ss @@ -1,4 +1,5 @@ <% if $Tags %> +
    <% loop $Tags %>
  • @@ -8,4 +9,5 @@
    • <% end_loop %>
+
<% end_if %> diff --git a/app/templates/SilverStripe/Forms/PasswordField.ss b/app/templates/SilverStripe/Forms/PasswordField.ss index e5b4b8d..7ede20d 100644 --- a/app/templates/SilverStripe/Forms/PasswordField.ss +++ b/app/templates/SilverStripe/Forms/PasswordField.ss @@ -1,5 +1,6 @@ - + + Show Password diff --git a/app/templates/SilverStripe/UserForms/Control/UserDefinedFormController_ReceivedFormSubmission.ss b/app/templates/SilverStripe/UserForms/Control/UserDefinedFormController_ReceivedFormSubmission.ss index 02cbdb2..6111b5c 100644 --- a/app/templates/SilverStripe/UserForms/Control/UserDefinedFormController_ReceivedFormSubmission.ss +++ b/app/templates/SilverStripe/UserForms/Control/UserDefinedFormController_ReceivedFormSubmission.ss @@ -1,4 +1,4 @@ -
+
$OnCompleteMessage
@@ -8,4 +8,4 @@ $CustomThankYouCode.RAW
<% end_if %> -
\ No newline at end of file +