Skip to content
This repository has been archived by the owner on Nov 28, 2022. It is now read-only.

Commit

Permalink
New settings/general styles
Browse files Browse the repository at this point in the history
  • Loading branch information
@JohnONolan @kevinansfield
JohnONolan authored and kevinansfield committed Feb 21, 2017
1 parent ad2193b commit 27ed167
Show file tree
Hide file tree
Showing 5 changed files with 139 additions and 104 deletions.
10 changes: 7 additions & 3 deletions app/styles/layouts/main.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -405,6 +405,12 @@ body > .ember-view:not(.liquid-target-container) {
.gh-mobile-nav-bar { display: none; }

@media (max-width: 800px) {

/* Make space for the mobile nav bar */
.gh-viewport {
padding-bottom: 55px;
}

.gh-mobile-nav-bar {
display: flex;
align-items: center;
Expand Down Expand Up @@ -518,9 +524,7 @@ body > .ember-view:not(.liquid-target-container) {
.view-content {
position: relative;
flex-grow: 1;
overflow-x: hidden;
overflow-y: auto;
-webkit-overflow-scrolling: touch;
padding-bottom: 4vw;
}

.view-content {
Expand Down
8 changes: 7 additions & 1 deletion app/styles/layouts/settings.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,8 @@
}

.gh-setting-content {
margin-right: 0 20px 0 0;
width: 100%;
margin: 0 50px 0 0;
}

.gh-setting-title {
Expand Down Expand Up @@ -51,6 +52,11 @@
height: 9px;
}

.gh-setting-content-extended {
width: 100%;
margin-top: 25px;
}


/* Navigation
/* ---------------------------------------------------------- */
Expand Down
8 changes: 4 additions & 4 deletions app/styles/patterns/forms.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ input {
.form-group {
position: relative;
margin-bottom: 1.6em;
max-width: 500px;
max-width: 700px;
width: 100%;
user-select: text;
}
Expand Down Expand Up @@ -124,13 +124,13 @@ input {
.gh-select,
select {
display: block;
padding: 8px 10px;
padding: 10px 12px;
width: 100%;
border: color(var(--lightgrey) l(-5%) s(-10%)) 1px solid;
border-radius: var(--border-radius);
color: color(var(--midgrey) l(-18%));
font-size: 1.4rem;
font-weight: normal;
font-size: 1.6rem;
font-weight: 300;
user-select: text;
transition: border-color 0.15s linear;

Expand Down
1 change: 0 additions & 1 deletion app/templates/components/gh-timezone-select.hbs
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
<label for="activeTimezone">Timezone</label>
<span class="gh-select" data-select-text="{{selectedTimezone.label}}" tabindex="0">
{{one-way-select
id="activeTimezone"
Expand Down
216 changes: 121 additions & 95 deletions app/templates/settings/general.hbs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,40 +2,83 @@
<header class="gh-canvas-header">
<h2 class="gh-canvas-title">General</h2>
<section class="view-actions">
{{#gh-spin-button class="gh-btn gh-btn-blue" action="save" submitting=submitting data-test-save-button=true}}<span>Save</span>{{/gh-spin-button}}
{{#gh-spin-button class="gh-btn gh-btn-blue" action="save" submitting=submitting data-test-save-button=true}}<span>Save settings</span>{{/gh-spin-button}}
</section>
</header>

<section class="view-container">
<form id="settings-general" novalidate="novalidate">
<fieldset>

{{#gh-form-group errors=model.errors hasValidated=model.hasValidated property="title"}}
<label for="blog-title">Blog Title</label>
{{gh-input model.title id="blog-title" name="general[title]" type="text" focusOut=(action "validate" "title" target=model) update=(action (mut model.title))}}
{{gh-error-message errors=model.errors property="title"}}
<p>The name of your blog</p>
{{/gh-form-group}}

{{#gh-form-group errors=model.errors hasValidated=model.hasValidated property="description" class="description-container"}}
<label for="blog-description">Blog Description</label>
{{gh-textarea model.description id="blog-description" name="general[description]" focusOut=(action "validate" "description" target=model) update=(action (mut model.description))}}
{{gh-error-message errors=model.errors property="description"}}
<p>
Describe what your blog is about
{{gh-count-characters model.description}}
</p>
{{/gh-form-group}}
</fieldset>

<div class="form-group">
<label>Blog Logo</label>

<div class="gh-setting-header">Publication info</div>
<div class="gh-setting">
<div class="gh-setting-content">
<div class="gh-setting-title">Title &amp; description</div>
<div class="gh-setting-desc">The details used to identify your publication around the web</div>
<div class="gh-setting-content-extended">
{{#gh-form-group errors=model.errors hasValidated=model.hasValidated property="title"}}
{{gh-input model.title id="blog-title" name="general[title]" type="text" focusOut=(action "validate" "title" target=model) update=(action (mut model.title))}}
{{gh-error-message errors=model.errors property="title"}}
<p>The name of your site</p>
{{/gh-form-group}}

{{#gh-form-group errors=model.errors hasValidated=model.hasValidated property="description" class="description-container"}}
{{gh-input model.description id="blog-description" name="general[description]" type="text" focusOut=(action "validate" "description" target=model) update=(action (mut model.description))}}
{{gh-error-message errors=model.errors property="description"}}
<p>Used in your theme, meta data and search results</p>
{{/gh-form-group}}
</div>
</div>
<div class="gh-setting-action">
<button type="button" class="gh-btn gh-btn-hover-blue" {{action "exportData"}}><span>Close</span></button>
</div>
</div>
<div class="gh-setting">
<div class="gh-setting-content">
<div class="gh-setting-title">Site timezone</div>
<div class="gh-setting-desc">Set the time and date of your publication, used for all published posts</div>
<div class="gh-setting-content-extended">
{{gh-timezone-select
activeTimezone=model.activeTimezone
availableTimezones=availableTimezones
update=(action "setTimezone")}}
</div>
</div>
<div class="gh-setting-action">
<button type="button" class="gh-btn gh-btn-hover-blue" {{action "exportData"}}><span>Close</span></button>
</div>
</div>

<div class="gh-setting-header">Publication identity</div>
<div class="gh-setting">
<div class="gh-setting-content">
<div class="gh-setting-title">Publication icon</div>
<div class="gh-setting-desc">A square, social icon used in the UI of your publication, at least 60x60px</div>
</div>
<div class="gh-setting-action">
{{#if model.icon}}
<img class="blog-icon" src="{{model.icon}}" alt="icon" role="button" {{action "toggleUploadIconModal"}}>
{{else}}
<button type="button" class="gh-btn js-modal-logo" {{action "toggleUploadIconModal"}}><span>Upload Image</span></button>
{{/if}}

{{#if showUploadIconModal}}
{{gh-fullscreen-modal "upload-image"
model=(hash model=model imageProperty="icon" accept=iconMimeTypes extensions=iconExtensions allowUrlInput=false uploadUrl="/uploads/icon/")
close=(action "toggleUploadIconModal")
modifier="action wide"}}
{{/if}}
</div>
</div>
<div class="gh-setting">
<div class="gh-setting-content">
<div class="gh-setting-title">Publication logo</div>
<div class="gh-setting-desc">The primary logo for your brand displayed across your theme, should be transparent and at least 600px x 72px</div>
</div>
<div class="gh-setting-action">
{{#if model.logo}}
<img class="blog-logo" src="{{model.logo}}" alt="logo" role="button" {{action "toggleUploadLogoModal"}}>
{{else}}
<button type="button" class="gh-btn gh-btn-green js-modal-logo" {{action "toggleUploadLogoModal"}}><span>Upload Image</span></button>
<button type="button" class="gh-btn js-modal-logo" {{action "toggleUploadLogoModal"}}><span>Upload Image</span></button>
{{/if}}
<p>Display a logo for your publication</p>

{{#if showUploadLogoModal}}
{{gh-fullscreen-modal "upload-image"
Expand All @@ -44,34 +87,18 @@
modifier="action wide"}}
{{/if}}
</div>

{{#if config.fileStorage}}
<div class="form-group">
<label>Blog Icon</label>
{{#if model.icon}}
<img class="blog-icon" src="{{model.icon}}" alt="icon" role="button" {{action "toggleUploadIconModal"}}>
{{else}}
<button type="button" class="gh-btn gh-btn-green js-modal-logo" {{action "toggleUploadIconModal"}}><span>Upload Image</span></button>
{{/if}}
<p>Upload a square blog icon ('.ico' or '.png', max. 100kb, 32px * 32px up to 1,000px * 1,000px) for your publication</p>

{{#if showUploadIconModal}}
{{gh-fullscreen-modal "upload-image"
model=(hash model=model imageProperty="icon" accept=iconMimeTypes extensions=iconExtensions allowUrlInput=false uploadUrl="/uploads/icon/")
close=(action "toggleUploadIconModal")
modifier="action wide"}}
{{/if}}
</div>
{{/if}}

<div class="form-group">
<label>Blog Cover</label>
</div>
<div class="gh-setting">
<div class="gh-setting-content">
<div class="gh-setting-title">Publication cover</div>
<div class="gh-setting-desc">An optional large background image for your site</div>
</div>
<div class="gh-setting-action">
{{#if model.cover}}
<img class="blog-cover" src="{{model.cover}}" alt="cover photo" role="button" {{action "toggleUploadCoverModal"}}>
{{else}}
<button type="button" class="gh-btn gh-btn-green js-modal-cover" {{action "toggleUploadCoverModal"}}><span>Upload Image</span></button>
<button type="button" class="gh-btn js-modal-cover" {{action "toggleUploadCoverModal"}}><span>Upload Image</span></button>
{{/if}}
<p>Display a cover image on your site</p>

{{#if showUploadCoverModal}}
{{gh-fullscreen-modal "upload-image"
Expand All @@ -80,67 +107,65 @@
modifier="action wide"}}
{{/if}}
</div>

<fieldset>

<div class="form-group">
{{#gh-form-group errors=model.errors hasValidated=model.hasValidated property="postsPerPage"}}
<label for="postsPerPage">Posts per page</label>
{{! `pattern` brings up numeric keypad allowing any number of digits}}
{{gh-input model.postsPerPage id="postsPerPage" name="general[postsPerPage]" focusOut=(action "validate" "postsPerPage" target=model) min="1" max="1000" type="number" pattern="[0-9]*" update=(action (mut model.postsPerPage))}}
{{gh-error-message errors=model.errors property="postsPerPage"}}
<p>How many posts should be displayed on each page</p>
{{/gh-form-group}}
</div>

<div class="form-group for-checkbox">
<label for="permalinks">Dated Permalinks</label>
<label class="checkbox" for="permalinks">
{{one-way-checkbox isDatedPermalinks id="permalinks" class="gh-input" name="general[permalinks]" update=(action (mut isDatedPermalinks))}}
<span class="input-toggle-component"></span>
<p>Include the date in your post URLs</p>
</label>
</div>

<div class="form-group">
</div>

<div class="gh-setting-header">Social accounts</div>
<div class="gh-setting">
<div class="gh-setting-content">
<div class="gh-setting-title">Social accounts</div>
<div class="gh-setting-desc">Link your social accounts for full structured data and rich card support</div>
<div class="gh-setting-content-extended">
{{#gh-form-group errors=model.errors hasValidated=model.hasValidated property="facebook"}}
<label for="facebook">Facebook Page</label>
<input value={{model.facebook}} oninput={{action (mut _scratchFacebook) value="target.value"}} {{action "validateFacebookUrl" on="focusOut"}} type="url" class="gh-input" id="facebook" name="general[facebook]" placeholder="https://www.facebook.com/ghost" autocorrect="off" />
{{gh-error-message errors=model.errors property="facebook"}}
<p>URL of your blog's Facebook Page</p>
<p>URL of your publication's Facebook Page</p>
{{/gh-form-group}}
</div>
<div class="form-group">
{{#gh-form-group errors=model.errors hasValidated=model.hasValidated property="twitter"}}
<label for="twitter">Twitter Profile</label>
<input value={{model.twitter}} oninput={{action (mut _scratchTwitter) value="target.value"}} {{action "validateTwitterUrl" on="focusOut"}} type="url" class="gh-input" id="facebook" name="general[twitter]" placeholder="https://twitter.com/tryghost" autocorrect="off" />
{{gh-error-message errors=model.errors property="twitter"}}
<p>URL of your blog's Twitter profile</p>
<p>URL of your publication's Twitter profile</p>
{{/gh-form-group}}
</div>
</div>
<div class="gh-setting-action">
<button type="button" class="gh-btn gh-btn-hover-blue" {{action "exportData"}}><span>Close</span></button>
</div>
</div>

{{gh-timezone-select
activeTimezone=model.activeTimezone
availableTimezones=availableTimezones
update=(action "setTimezone")}}

<div class="form-group for-checkbox">
<label for="isPrivate">Make this blog private</label>
<label class="checkbox" for="isPrivate">
{{one-way-checkbox model.isPrivate id="isPrivate" name="general[isPrivate]" type="checkbox" update=(action (mut model.isPrivate))}}
<span class="input-toggle-component"></span>
<p>Enable password protection</p>
</label>
</div>

<div class="gh-setting-header">Advanced settings</div>
<div class="gh-setting">
<div class="gh-setting-content">
<div class="gh-setting-title">Use dated permalinks</div>
<div class="gh-setting-desc">Include the date in your post URLs, eg. <strong>blogurl.com/2017/01/post-title/</strong></div>
</div>
<div class="gh-setting-action">
{{one-way-checkbox isDatedPermalinks id="permalinks" name="general[permalinks]" type="checkbox" update=(action (mut isDatedPermalinks))}}
<span class="input-toggle-component"></span>
</div>
</div>
<div class="gh-setting">
<div class="gh-setting-content">
<div class="gh-setting-title">Make this site private</div>
<div class="gh-setting-desc">Enable protection with simple shared password, All search engine optimization and social features will be disabled.</div>
{{#if model.isPrivate}}
<div class="gh-setting-content-extended">
{{#gh-form-group errors=model.errors hasValidated=model.hasValidated property="password"}}
{{gh-input model.password name="general[password]" type="text" focusOut=(action "validate" "password" target=model) update=(action (mut model.password))}}
{{gh-error-message errors=model.errors property="password"}}
<p>This password will be needed to access your blog. All search engine optimization and social features are now disabled. This password is stored in plaintext.</p>
<p>Set the password for this site</p>
{{/gh-form-group}}
</div>
{{/if}}
</fieldset>
</div>
<div class="gh-setting-action">
{{one-way-checkbox model.isPrivate id="isPrivate" name="general[isPrivate]" type="checkbox" update=(action (mut model.isPrivate))}}
<span class="input-toggle-component"></span>
</div>
</div>


<form id="settings-general" novalidate="novalidate">


<div class="settings-themes">
<h3 id="themes">Themes</h3>
Expand Down Expand Up @@ -169,6 +194,7 @@
{{/if}}
</div>
</form>

</section>
</section>

Expand Down

0 comments on commit 27ed167

Please sign in to comment.