Skip to content
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.

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

Improve CMS post summary UI #268

Merged
merged 8 commits into from
May 25, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 0 additions & 1 deletion .holo/lenses/emergence-cms-editor.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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/**",
Expand Down
1 change: 0 additions & 1 deletion docs/development/getting-started/content-editor.md
Original file line number Diff line number Diff line change
Expand Up @@ -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/`
Expand Down
10 changes: 5 additions & 5 deletions html-templates/blog/blogPosts.tpl
Original file line number Diff line number Diff line change
Expand Up @@ -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}
Expand All @@ -24,4 +24,4 @@
<strong>{$total|number_format} posts:</strong> {pagingLinks $total pageSize=$limit}
</footer>
{/if}
{/block}
{/block}
4 changes: 2 additions & 2 deletions html-templates/designs/site.tpl
Original file line number Diff line number Diff line change
Expand Up @@ -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">
Expand Down Expand Up @@ -100,4 +100,4 @@
{log_report}
</body>

</html>
</html>
3 changes: 1 addition & 2 deletions sencha-workspace/EmergenceContentEditor/app.json
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,7 @@
"requires": [
"font-awesome",
"jarvus-hotfixes",
"emergence-cms",
"emergence-cms-summaries"
"emergence-cms"
],

/**
Expand Down
1 change: 1 addition & 0 deletions sencha-workspace/EmergenceContentEditor/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -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>

Expand Down
2 changes: 0 additions & 2 deletions sencha-workspace/packages/emergence-cms-summaries/Readme.md

This file was deleted.

92 changes: 0 additions & 92 deletions sencha-workspace/packages/emergence-cms-summaries/build.xml

This file was deleted.

This file was deleted.

Loading