Permalink
Browse files

Tweaked theme page and services page

  • Loading branch information...
davidmerfield committed Dec 1, 2018
1 parent 0f63b01 commit 7c81508c2d58c20380cc6a33ed82b0ca2dd687c1
@@ -106,7 +106,7 @@ settings.get('/settings/urls/redirects', load.redirects, function(req, res){
// Load the list of templates for this user
settings.use("/settings/theme", load.theme, function(req, res, next) {
res.locals.breadcrumbs.add("Theme", "theme");
res.locals.breadcrumbs.add("Template", "theme");
next();
});
@@ -115,15 +115,15 @@ settings.use('/settings/client', require('./client'));
settings
.route("/settings/theme")
.get(function(req, res) {
res.render("theme", {title: "Theme"});
res.render("theme", {title: "Temmplate"});
})
.post(require('./save/theme'));
settings
.route("/settings/theme/new")
.get(function(req, res) {
res.locals.breadcrumbs.add("Create new theme", "new");
res.render("theme/new", {title: 'Create new theme'});
res.locals.breadcrumbs.add("New", "new");
res.render("theme/new", {title: 'New template'});
})
.post(require('./save/newTheme'));
@@ -1929,3 +1929,26 @@ button.content-line .file {float: none}
.photo-holder img {vertical-align:text-bottom;max-width:16px;max-height:16px;}
.photo-holder.plus {background: rgba(0,0,0,0.05);line-height: 0.9}
::-webkit-input-placeholder { /* WebKit, Blink, Edge */
color: #ccc;
}
:-moz-placeholder { /* Mozilla Firefox 4 to 18 */
color: #ccc;
opacity: 1;
}
::-moz-placeholder { /* Mozilla Firefox 19+ */
color: #ccc;
opacity: 1;
}
:-ms-input-placeholder { /* Internet Explorer 10-11 */
color: #ccc;
}
::-ms-input-placeholder { /* Microsoft Edge */
color: #ccc;
}
::placeholder { /* Most modern browsers support this now. */
color: #ccc;
}
@@ -35,8 +35,7 @@
<a href="{{url}}" class="crumb {{#last}}last{{/last}}">{{label}}</a>
{{^last}}
<span style=" margin: 0 -1em 0 -0.5em;
line-height: 3;" ><svg width="11" height="9" style="transform:rotate(270deg)" viewBox="0 0 10 12" xmlns="http://www.w3.org/2000/svg"><path d="M5.998 6.244c-.255 0-.51-.098-.703-.292L1.048 1.705C.663 1.32.66.683 1.05.293 1.444-.1 2.073-.1 2.462.29L6 3.83 9.538.29c.384-.384 1.02-.388 1.412.003.393.393.39 1.023.002 1.412L6.705 5.952c-.192.192-.447.29-.702.29z" fill="rgb(153, 153, 153)"></path></svg></span>
<span style="margin:11px -1em 0 -0.5em" ><svg width="11" height="9" style="transform:rotate(270deg)" viewBox="0 0 10 12" xmlns="http://www.w3.org/2000/svg"><path d="M5.998 6.244c-.255 0-.51-.098-.703-.292L1.048 1.705C.663 1.32.66.683 1.05.293 1.444-.1 2.073-.1 2.462.29L6 3.83 9.538.29c.384-.384 1.02-.388 1.412.003.393.393.39 1.023.002 1.412L6.705 5.952c-.192.192-.447.29-.702.29z" fill="rgb(153, 153, 153)"></path></svg></span>
{{/last}}
{{/breadcrumbs}}
@@ -1,28 +1,28 @@
<p><b>{{blog.title}}</b> comes with a Blot subdomain. You can also <a href="/configuring/domain">configure a domain you control</a>.</p>
<style type="text/css">
form label {text-transform:none;letter-spacing:0;color:rgb(158, 154, 152);font-size:16px}
p a{color:#365899;text-decoration:none}
p a:hover{text-decoration: underline;}</style>
<p style="margin:15px 0"><b>{{blog.title}}</b> comes with a Blot subdomain. You can also <a href="/configuring/domain">configure a domain you control</a>.</p>
<input type="hidden" name="redirect" value="/settings/domain">
<label>Your domain</label>
<div class="messageWrapper">
<input type="text" id="customDomain" name="domain" value="{{blog.domain}}" placeholder="Your website’s hostname"/>
<input type="text" id="customDomain" name="domain" value="{{blog.domain}}" placeholder="Enter your website’s hostname"/>
<span id="inputMessage" class="inputMessage"></span>
</div>
<span class="error" >{{errors.domain}}</span>
{{#blog.domain}}
<p class="mess error" style=" box-sizing: content-box;
border-radius:0;border:none;display:none;margin:20px -20px 0;padding: 8px 20px" id="warning">Please create a CNAME DNS record for the <b>www</b> subdomain which points to <b>{{host}}</b> or read the <a href="/configuring/domain">guide to using your own domain</a>.
border-radius:0;border:none;display:none;margin:20px -20px 0;padding: 8px 20px" id="warning">Please create a CNAME DNS record for the <b>www</b> subdomain which points to <b>{{host}}</b> or read the <a href="/configuring/domain">guide to using your own domain</a>.
</p>
<label>
<input name='forceSSL' type='hidden' value='off' >
<input name='forceSSL' type="checkbox" {{#blog.forceSSL}}checked{{/blog.forceSSL}}/> Redirect HTTP traffic to HTTPS
</label>
{{#footer}}
<script src="/scripts/jquery.js?{{cacheID}}"></script>
@@ -48,11 +48,11 @@
</script>
{{/footer}}
{{/blog.domain}}
<br>
<label for="handle">
Blot subdomain<br>
</label>
<div style="display:flex">
<input type="text" name="handle" value="{{blog.handle}}" style="flex-grow:1;display:inline-block"/>
<span style="color:#888;line-height:42px">&nbsp;.{{host}}</span>
<div style="position:relative;background:#fff;border-radius:4px">
<span style="color:#ccc;position:absolute;right:11px;top:9px">&nbsp;.{{host}}</span>
<input type="text" style="background:transparent" name="handle" value="{{blog.handle}}" style=""/>
</div>
@@ -1,16 +1,19 @@
<input type="hidden" name="redirect" value="/settings/services">
<a class="line" href="/services/urls" style="margin:0 -20px">
<a class="line" href="/settings/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}}
Edit URL rules.
</span>
<span class="right" style="padding-left:0">Edit</span>
</a>
<label>
<input name='forceSSL' type='hidden' value='off' >
<input name='forceSSL' type="checkbox" {{#blog.forceSSL}}checked{{/blog.forceSSL}}/> Redirect HTTP traffic to HTTPS
</label>
<style type="text/css">
.plugin label,.plugin p {margin: 0}
.plugin label {line-height: 1.5}
@@ -24,7 +24,8 @@
color: #999
}
.line.theme:hover {background: rgba(0,0,0,0.02)}
/*.line.theme {border: 1px solid rgba(0,0,0,0.05);margin-bottom: 11px}
*/.line.theme:hover {background: rgba(0,0,0,0.02)}
.preview-button, .line form {float: right;}
.preview-cover:hover + .preview-button .square,
@@ -38,37 +39,37 @@
<input type="hidden" name="redirect" value="/theme">
{{^blog.template}}
<div class="line" style="border-bottom:none">
<span class="box orange fr" style="line-height:2.5;background:#f2f2f2;padding:0 1.33em;border:#aaa;margin:0 0">Your theme is disabled. </span>
<div class="lisne" style="border-bottom:none">
<span class="box orange fr" style="line-height:2.5;background:#f2f2f2;padding:0 1.33em;border:#aaa;margin:0 0">Your template is disabled. </span>
<form method='post' style="display:inline">
<input type="hidden" name="_csrf" value="{{csrftoken}}">
<input type="hidden" name="template" value="SITE:default" >
<button type="submit"><span class="square">Enable your theme</span></button>
<button type="submit"><span class="square">Enable your template</span></button>
</form>
</div>
{{/blog.template}}
{{#blog.template}}
<div class="line">
<div class="linse">
<p>
<b style="font-weight:500">{{blog.title}}</b> uses the <b style="font-weight:500">{{#templates}} {{#checked}}{{name}}{{/checked}}{{/templates}}</b> theme.</p>
<style type="text/css">
form label {text-transform:none;letter-spacing:0;color:rgb(158, 154, 152);font-size:16px}
p a{color:#365899;text-decoration:none}
p a:hover{text-decoration: underline;}</style>
<!-- <p style="margin:15px 0"><b>{{blog.title}}</b> uses the <b style="font-weight:500">{{#templates}} {{#checked}}{{name}}{{/checked}}{{/templates}}</b> theme. </p>
-->
<a class="line" style="color:#365899" href="/settings/theme/new">
Create new template</a>
<Br>
<span style="color:rgb(153, 153, 153)">Your themes <a class="butty" href="/settings/theme/new">Create new theme</a>
</span>
</div>
@@ -93,13 +94,13 @@
<a target="_blank" class="preview-cover" href="{{previewURL}}"></a>
<!-- <span class="icon file"></span>
-->
<a href="{{previewURL}}" class="preview-button" target="_blank" ><span class="square">Preview</span></a>
<form method='post' style="display:inline">
<input type="hidden" name="_csrf" value="{{csrftoken}}">
<input type="hidden" name="template" value="{{id}}" >
<button {{#checked}}disabled{{/checked}} type="submit"><span class="square">Install</span></button>
<button {{#checked}}disabled{{/checked}} type="submit"><span class="square">Install{{#checked}}ed{{/checked}}</span></button>
</form>
{{#isMine}}
<a href="{{editURL}}/settings" style="margin-right:0;padding-right:11px" class="preview-button" ><span class="square">Edit</span></a>
@@ -109,13 +110,14 @@
<div class="clear"></div>
{{/templates}}
<br><div class="line">
<form method='post' style="float:left">
<form method='post'>
<input type="hidden" name="redirect" value="/settings/theme">
<input name="template" value="" type="hidden"/>
<button type="submit">Disable your theme</button>
<button type="submit" style="color:#365899;padding:11px 20px;display:block;text-align:left;width:100%">Disable your template</button>
</form>
</div>
{{/blog.template}}
@@ -1,5 +1,9 @@
<style type="text/css">
form label {text-transform:none;letter-spacing:0;color:rgb(158, 154, 152);font-size:16px}
p a{color:#365899;text-decoration:none}
p a:hover{text-decoration: underline;}</style>
<form method='post' style="padding:0 20px" >
<br>
<input type="hidden" name="_csrf" value="{{csrftoken}}">
<input type="hidden" name="redirect" value="/settings/theme">

0 comments on commit 7c81508

Please sign in to comment.