Merge pull request #268 from JarvusInnovations/features/improve-cms-p…

…ost-summary-ui Improve CMS post summary UI
JarvusInnovations · May 25, 2021 · cd2f9cf · cd2f9cf
2 parents aa5d4a4 + 7f2a596
commit cd2f9cf
Show file tree

Hide file tree

Showing 22 changed files with 287 additions and 481 deletions.
diff --git a/.holo/lenses/emergence-cms-editor.toml b/.holo/lenses/emergence-cms-editor.toml
@@ -10,7 +10,6 @@ files = [
     "EmergenceContentEditor/**",
     "packages/emr-skeleton-theme/**",
     "packages/emergence-cms/**",
-    "packages/emergence-cms-summaries/**",
     "packages/emergence-apikit/**",
     "packages/jarvus-apikit/**",
     "packages/jarvus-fileupload/**",

diff --git a/docs/development/getting-started/content-editor.md b/docs/development/getting-started/content-editor.md
@@ -5,7 +5,6 @@
 - `sencha-workspace/`
     - `packages/`
         - `emergence-cms/`: Primary location for content editor UI code
-        - `emergence-cms-summaries/`: Optional plugin that adds UI for attaching summaries to content
         - `emr-skeleton-theme/`: The Sencha theme used when rendering the content editor
     - `EmergenceContentEditor/`: A thin Sencha application used to make development easier and to provide a build target for generating the theme
 - `html-templates/`

diff --git a/html-templates/blog/blogPosts.tpl b/html-templates/blog/blogPosts.tpl
@@ -3,17 +3,17 @@
 {block "content"}
     {load_templates "subtemplates/blog.tpl"}
     {load_templates "subtemplates/paging.tpl"}
-    
+
     <header class="page-header">
         <h2 class="header-title">Blog Feed</h2>
         <div class="header-buttons">
             <a href="/blog/create" class="button primary">Create a Post</a>
-        </div>            
+        </div>
     </header>
-    
+
     <section class="page-section article-collection">
     {foreach item=BlogPost from=$data}
-        {blogPost $BlogPost headingLevel=h3}
+        {blogPost $BlogPost headingLevel=h3 useSummary=true}
     {foreachelse}
         <p class="empty-text">Stay tuned for the first post&hellip;</p>
     {/foreach}
@@ -24,4 +24,4 @@
         <strong>{$total|number_format} posts:</strong> {pagingLinks $total pageSize=$limit}
     </footer>
     {/if}
-{/block}
+{/block}
diff --git a/html-templates/designs/site.tpl b/html-templates/designs/site.tpl
@@ -42,7 +42,7 @@
 	{block "header"}
 		{* the things in here should probably be set up as configurable subtemplates in some way (especially nav) *}
 		<h1 id="logo">
-			<a href="/"><img src="http://placehold.it/300x40" alt="{$.Site.title|escape}" width="300" height="40"></a>
+			<a href="/"><img src="/img/logo.png" alt="{$.Site.title|escape}" width="200" height="80"></a>
 		</h1>
 
 		<section id="user-info">
@@ -100,4 +100,4 @@
 	{log_report}
 </body>
 
-</html>
+</html>
diff --git a/sencha-workspace/EmergenceContentEditor/app.json b/sencha-workspace/EmergenceContentEditor/app.json
@@ -18,8 +18,7 @@
     "requires": [
         "font-awesome",
         "jarvus-hotfixes",
-        "emergence-cms",
-        "emergence-cms-summaries"
+        "emergence-cms"
     ],
 
     /**

diff --git a/sencha-workspace/EmergenceContentEditor/index.html b/sencha-workspace/EmergenceContentEditor/index.html
@@ -4,6 +4,7 @@
     <meta http-equiv="X-UA-Compatible" content="IE=edge">
     <meta charset="UTF-8">
     <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=10, user-scalable=yes">
+    <style>html, body { font-family: system-ui; }</style>
 
     <title>EmergenceContentEditor</title>
 

diff --git a/sencha-workspace/packages/emergence-cms-summaries/Readme.md b/sencha-workspace/packages/emergence-cms-summaries/Readme.md
diff --git a/sencha-workspace/packages/emergence-cms-summaries/build.xml b/sencha-workspace/packages/emergence-cms-summaries/build.xml
diff --git a/sencha-workspace/packages/emergence-cms-summaries/overrides/Editor.js b/sencha-workspace/packages/emergence-cms-summaries/overrides/Editor.js