Permalink
Browse files

More settings re-arrangement

  • Loading branch information...
davidmerfield committed Nov 17, 2018
1 parent 136c8a4 commit 2b07e8bc87fcd722fb88654e60c352a5d24a9898
@@ -18,6 +18,16 @@ settings.get("/settings", function(req, res, next) {
res.redirect("/");
});
settings.use(function(req, res, next) {
res.locals.breadcrumbs.add("Settings", "/settings");
res.locals.setup = !!req.query.setup;
next();
});
var index = settings.route("/");
index.get(
@@ -37,14 +47,6 @@ index.get(
);
settings.use(function(req, res, next) {
res.locals.breadcrumbs.add("Settings", "/settings");
res.locals.setup = !!req.query.setup;
next();
});
settings
.route("/settings")
.post(
@@ -68,7 +70,7 @@ settings.get("/settings/urls", function(req, res, next) {
next();
});
settings.get("/settings/title", function(req, res, next){
settings.get("/settings/profile", load.menu, load.timezones, load.dates, function(req, res, next){
res.locals.setup_title = true;
next();
});
@@ -1663,8 +1663,7 @@ form.account > .buttons {
.line {
display: block;
padding: 11px 0;
margin: 0 20px;
padding: 11px 20px;
}
a.line:hover,
@@ -1748,7 +1747,7 @@ form.account, .inset {padding:20px}
.mess .link {float: right;color: inherit;}
.mess:hover .link {text-decoration: underline;}
.wrapper {margin:0 auto;display: flex;min-height: 100%;padding: 40px 0 40px}
.wrapper {margin:0 auto;display: flex;min-height: 100%;padding: 80px 0 40px}
.head {height:123px;padding-top:20px;}
@@ -11,7 +11,7 @@
<div class="middle" style="flex-basis:33%;display:flex;flex-direction:column;">
<div style="flex-grow:1;">
<div style="border-left:1px solid rgba(0,0,0,0.08);padding-left:21px;padding-bottom:21px">
<div style="padding-left:21px;padding-bottom:21px">
<!--
{{#message}}{{^error}}
<a href="" class="mess success" style="margin-bottom:19px">
@@ -55,7 +55,7 @@
</div>
<div style="font-size:14px;opacity:0.3;padding:40px 20px 9px 42px"><a style="color:inherit;text-decoration:none" href="/account">Your account</a> &puncsp;·&puncsp; <a style="color:inherit;text-decoration:none" href="/help">Documentation</a> &puncsp;·&puncsp; <a style="color:inherit;text-decoration:none" href="/contact">Contact</a></div>
<div style="opacity:0.3;padding:40px 20px 9px 42px"><a style="color:inherit;text-decoration:none" href="/account">Your account</a> &puncsp;·&puncsp; <a style="color:inherit;text-decoration:none" href="/help">Documentation</a> &puncsp;·&puncsp; <a style="color:inherit;text-decoration:none" href="/contact">Contact</a></div>
</div>
@@ -65,7 +65,7 @@
{{> folder}}
<a href="{{blog.url}}" target="_blank" style="width: 150px;
<!-- <a href="{{blog.url}}" target="_blank" style="width: 150px;
height: 150px;
margin: 0 41px;
line-height: 150px;
@@ -75,7 +75,7 @@
text-align: center;
background: #000;
text-decoration:none;
">Visit</a>
">Visit</a> -->
<!-- <div style="font-size:14px;opacity:0.3;padding:40px 20px 10px">
13GB used
<div style="float:right">Last sync: 12 minutes ago
@@ -1,5 +1,8 @@
{{> sub_nav}}
<!-- <span style="color:rgba(0,0,0,0.3)">Settings</span>
<hr style="margin-bottom:0"> -->
<form method='post' action='?_csrf={{csrftoken}}' enctype='multipart/form-data'>
{{^client}}
@@ -10,7 +13,7 @@
</a>
{{/client}}
<a class="line" href="/settings/title">
<a class="line" href="/settings/profile">
<span class="label">Profile</span>
<span class="center">
@@ -80,19 +83,20 @@
</a> -->
<a class="line" href="/settings/services">
<span class="label">Services</span>
<span class="link">Import, export and other services
</span>
</a>
<a class="line" href="/settings/client/{{name}}" style="border-bottom:none">
<a class="line" href="/settings/client/{{name}}" >
<span class="label">Client</span>
<span class="center">{{client.display_name}}</span>
<span class="right">Edit</span>
</a>
<a class="line" href="/settings/services" style="border-bottom:none">
<span class="label">Services</span>
<span class="link">Import, export and typography
</span>
</a>
</form>

This file was deleted.

Oops, something went wrong.
@@ -1,41 +1,7 @@
<label for="title">Title</label>
<input type="hidden" name="redirect" value="/settings/title">
<input type="hidden" name="redirect" value="/settings/profile">
<input type="text" autofocus name="title" value="{{blog.title}}">
<label>
What is your timezone?<br />
<select name="timeZone" style="max-width:300px">
{{#timeZones}}
<option value="{{value}}" {{selected}}>{{time}} {{value}}</option>
{{/timeZones}}
</select>
</label>
<label>
How do you write your dates?<br />
<select name="dateFormat">
{{#dateFormats}}
<option value="{{value}}" {{selected}}>{{date}}</option>
{{/dateFormats}}
</select>
</label>
<a class="line" href="/settings/menu" style="margin:0 -20px">
<span class="label">Menu</span>
<span class="center">
{{#blog.menu}}<span class="tablet">{{label}}</span>{{/blog.menu}}
{{^blog.menu.length}}<i>Your menu is empty</i>{{/blog.menu.length}}
</span>
<span class="right" style="padding-left:0">Edit</span>
</a>
<p>This photo can be used in your site’s theme and is used to generate your site’s favicon.</p>
<input type="hidden" name="redirect" value="/settings/photo">
<label>Photo</label>
@@ -48,15 +14,13 @@
<div style="float:left;">
<label style="margin-top:0">
<input type='hidden' value='off' name='roundAvatar'>
<!-- <input type='hidden' value='off' name='roundAvatar'>
<input {{#blog.roundAvatar}}checked{{/blog.roundAvatar}} type="checkbox" name="roundAvatar"/> Make my photo rounded
</label>
--></label>
<button class="button small" name="avatar" value="" type="submit">Remove photo</button>
</div>
<div class="clear"></div><br>
{{/blog.avatar}}
<section class="imageUpload" style="width:50%;float:left;">
@@ -65,7 +29,45 @@
{{/blog.avatar}}
<input type='file' id="avatarUpload" name='avatar' />
{{#blog.avatar}}
<button class="button small" name="avatar" value="" type="submit">Remove existing photo</button>
{{/blog.avatar}}
</section>
<div class="clear"></div>
<a class="line" href="/settings/menu" style="border-bottom:none;margin:0 -20px">
<label>Menu</label>
<span class="center">
{{#blog.menu}}<span class="tablet">{{label}}</span>{{/blog.menu}}
{{^blog.menu.length}}<i>Your menu is empty</i>{{/blog.menu.length}}
</span>
<span class="right" style="padding-left:0">Edit</span>
</a>
<label>
Timezone<br />
<select name="timeZone" style="max-width:300px">
{{#timeZones}}
<option value="{{value}}" {{selected}}>{{time}} {{value}}</option>
{{/timeZones}}
</select>
</label>
<label>
In what order do you write your dates?<br />
<select name="dateFormat">
{{#dateFormats}}
<option value="{{value}}" {{selected}}>{{date}}</option>
{{/dateFormats}}
</select>
</label>
<div class="clear"></div><br>
@@ -1,6 +1,16 @@
<input type="hidden" name="redirect" value="/settings/services">
<a class="line" href="/services/urls" style="margin:0 -20px">
<label>URLs</label>
<span class="center">
{{#blog.menu}}<span class="tablet">{{label}}</span>{{/blog.menu}}
{{^blog.menu.length}}<i>Your menu is empty</i>{{/blog.menu.length}}
</span>
<span class="right" style="padding-left:0">Edit</span>
</a>
<style type="text/css">
.plugin label,.plugin p {margin: 0}
.plugin label {line-height: 1.5}
@@ -4,6 +4,23 @@
<input type="text" name="name" value="{{name}}"/>
</label>
<label>
How should the date appear on your blog?<br />
<select name="dateDisplay">
{{#displayFormats}}
<option value="{{value}}" {{selected}}>{{date}}</option>
{{/displayFormats}}
</select>
</label>
<label>
<input type='hidden' value='off' name='hideDates'>
<input type="checkbox" name="hideDates" {{#blog.hideDates}}checked{{/blog.hideDates}}/> Hide the publish date for your posts
</label>
{{> locals}}
<br /><br />
@@ -62,21 +62,6 @@
<label>
How should the date appear on your blog?<br />
<select name="dateDisplay">
{{#displayFormats}}
<option value="{{value}}" {{selected}}>{{date}}</option>
{{/displayFormats}}
</select>
</label>
<label>
<input type='hidden' value='off' name='hideDates'>
<input type="checkbox" name="hideDates" {{#blog.hideDates}}checked{{/blog.hideDates}}/> Hide the publish date for your posts
</label>

0 comments on commit 2b07e8b

Please sign in to comment.