Permalink
Browse files

Fixed folder bugs

  • Loading branch information...
davidmerfield committed Nov 29, 2018
1 parent e320a16 commit e44342b9a2e6e773a4b8175683559f599ef3f9fd
@@ -17,7 +17,7 @@ module.exports = function (server) {
// Ensure the viewer is logged in and
// owns a template with that name.
.all(loadTemplate, loadSidebar)
.all(loadTemplate, loadSidebar, require('../settings/load/dates'))
.get(function(req, res){
@@ -1916,4 +1916,16 @@ button.content-line .file {float: none}
.line-item .link {background:#f7f4f2;flex-grow:1;margin-left: 10px;padding: 4px 10px;text-align: center;}
.line-item .link:first-child {margin-left: 0}
.line-item .link span {display: none}
.line-item .link span {display: none}
.menu button:active {opacity: 0.8}
.photo-holder {
width: 16px;
height: 16px;
display: inline-block;
margin:0 16px 0 0
}
.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}
@@ -11,7 +11,7 @@
{{#folder.breadcrumbs}}
<button type="submit" {{#first}} style="padding:0 20px;color:rgb(158, 154, 152)"{{/first}} name="path" value="{{path}}" >{{label}}</button>
<button type="submit" {{#first}} style="padding:0 0 0 20px;color:rgb(158, 154, 152)"{{/first}} name="path" value="{{path}}" >{{label}}</button>
{{^last}}
<span style="margin:0 0 0 3px" ><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>
@@ -4,9 +4,9 @@
<input type="hidden" name="redirect" value="{{redirect}}">
{{^contents.length}}
<div style="margin:0 0">
<div style="padding: 0 20px 11px;border-bottom: 1px solid rgba(0,0,0,.05);">
This folder is empty.
<hr style="margin: 10px 0">
</div>
{{/contents.length}}
@@ -1,17 +1,4 @@
<style type="text/css">
.menu button:active {opacity: 0.8}
.photo-holder {
width: 16px;
height: 16px;
display: inline-block;
margin:0 16px 0 0
}
.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}
</style>
<div class="dropdown closed">
{{#blogs}}{{#isCurrent}}
@@ -24,8 +11,8 @@
<div class="clear"></div>
<div class="menu">
{{#blogs}}{{^isCurrent}}
<form action="/account/switch-blog" method="POST">
{{#blogs}}
<form action="/account/switch-blog" method="POST" {{#isCurrent}}style="height:0;visibility:hidden"{{/isCurrent}}>
<input type="hidden" name="_csrf" value="{{csrftoken}}">
<input type="hidden" name="to" value="{{id}}">
<button type="submit" style="display:flex;line-height:inherit;padding:11px 30px 11px 20px;color:#111;font-weight:500">
@@ -41,7 +28,7 @@
</button>
</form>
{{/isCurrent}}{{/blogs}}
{{/blogs}}
<div class="clear"></div>
@@ -4,7 +4,7 @@
<div class="wrapper">
<div style="margin:0 40px 0 0;display:flex;flex-direction:column">
<div style="margin:0 40px 0 20px;display:flex;flex-direction:column">
{{> dropdown}}
</div>
@@ -59,7 +59,7 @@
</div>
<div style="display:flex;flex-direction:column;flex-basis:50%;margin:0 40px">
<div style="display:flex;flex-direction:column;flex-basis:50%;margin:0 60px">
@@ -2,6 +2,7 @@
<input type="hidden" name="redirect" value="/settings/profile">
<input type="text" autofocus name="title" value="{{blog.title}}">
<hr>
<label>Photo</label>
@@ -25,20 +26,21 @@
<section class="imageUpload" style="width:50%;float:left;">
{{#blog.avatar}}
<span style="margin-top:0">Select new photo:</span>
<span style="margin-top:0;color:#aaa">Select new photo:</span>
{{/blog.avatar}}
<input type='file' id="avatarUpload" name='avatar' />
{{#blog.avatar}}
<button class="button small" name="avatar" value="" type="submit">Remove existing photo</button>
<input type="submit" value="Remove existing photo">
{{/blog.avatar}}
</section>
<div class="clear"></div>
<hr>
<a class="line" href="/settings/menu" style="border-bottom:none;margin:0 -20px">
<a class="line" href="/settings/menu" style="margin:0 -20px">
<label>Menu</label>
<span class="center">
{{#blog.menu}}<span class="tablet">{{label}}</span>{{/blog.menu}}
@@ -1,26 +1,10 @@
<div style="max-width:400px;margin-left:1.33em">
<label>Name:
<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}}
@@ -61,7 +45,26 @@
{{/isCurrent}}
</form>
<form method='post' action='/settings' enctype='multipart/form-data'>
<input type="hidden" name="redirect" value="{{base}}">
<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>
<input type="submit" class="button left" value="Save changes">
</form>
<br /><Br /><Br /><Br /><Br />
</div>

0 comments on commit e44342b

Please sign in to comment.