Skip to content

Commit

Permalink
simplify addition and deletion
Browse files Browse the repository at this point in the history 
Signed-off-by: Chris Warrick <kwpolska@gmail.com>
  • Loading branch information
@Kwpolska
Kwpolska committed Jan 4, 2015
1 parent 8af88da commit e9a618d
Show file tree
Hide file tree
Showing 8 changed files with 65 additions and 411 deletions.
163 changes: 48 additions & 115 deletions plugins/webapp/templates/mako/webapp_index.tmpl
View file
@@ -1,138 +1,65 @@
<%inherit file="base.tmpl"/>
<%block name="extra_head">
<link href="//maxcdn.bootstrapcdn.com/font-awesome/4.2.0/css/font-awesome.min.css" rel="stylesheet">
<script src="/static/js/jPages.min.js"></script>
<style type="text/css">
html {
overflow-y: scroll;
}

.post_holder, .page_holder {
margin: 15px 0;
padding: 10px;
border: 1px solid #dddddd;
border-radius: 5px;
text-align: center;
}

.post_holder a, .page_holder a {
/* font-size: 12px; */
cursor: pointer;
margin: 0 5px;
color: #333;
}

.post_holder a:hover, .page_holder a:hover {
background-color: #222;
color: #fff;
}

a.jp-previous { margin-right: 15px; }
a.jp-next { margin-left: 15px; }

a.jp-current, a.jp-current:hover {
color: #FF4242;
font-weight: bold;
}

a.jp-disabled, a.jp-disabled:hover {
color: #bbb;
}

a.jp-current, a.jp-current:hover,
a.jp-disabled, a.jp-disabled:hover {
cursor: default;
background: none;
}

.post_holder span, .page_holder span {
margin: 0 5px;
}

code {
color: #333;
background-color: #F9F2F4;
}
</style>
<style>
.list-group {
margin-top: 10px;
}
</style>
</%block>
<%block name="extra_js">
<script>
$('#deleteModal').on('show.bs.modal', function (event) {
var button = $(event.relatedTarget);
var title = button.data('ptitle');
var sourcepath = button.data('sourcepath');
var modal = $(this);
modal.find('.del-title').text(title);
modal.find('.sourcepath').val(sourcepath);
});
</script>
</%block>

<%block name="content">

<!-- New Page Modal -->
<div class="modal fade" id="newPage" tabindex="-1" role="dialog" aria-labelledby="newPageLabel" aria-hidden="true">
<form method="POST" action="/new/page">
<div class="modal-dialog">
<div class="modal-content">
<div class="modal-header">
<button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
<h4 class="modal-title" id="newPageLabel">Create New Page?</h4>
</div>
<div class="modal-body">
<input class="form-control" name="title" id="title" placeholder="Title">
</div>
<div class="modal-footer">
<button type="button" class="btn btn-default" data-dismiss="modal">Close</button>
<button type="submit" class="btn btn-primary">Create Page</button>
</div>
</div>
</div>
</form>
</div>

<!-- New Post Modal -->
<div class="modal fade" id="newPost" tabindex="-1" role="dialog" aria-labelledby="newPostLabel" aria-hidden="true">
<form method="POST" action="/new/post">
<div class="modal-dialog">
<div class="modal-content">
<div class="modal-header">
<button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
<h4 class="modal-title" id="newPostLabel">Create New Post?</h4>
</div>
<div class="modal-body">
<input class="form-control" name="title" id="title" placeholder="Title">
</div>
<div class="modal-footer">
<button type="button" class="btn btn-default" data-dismiss="modal">Close</button>
<button type="submit" class="btn btn-primary">Create Post</button>
</div>
</div>
</div>
</form>
</div>

<form method="POST">
<div class="row">
<div class="col-md-6">
<h2 style="text-align: center;">Posts</h2>
<div class="post_holder"></div>
<div class="list-group" id="post_container">
<form method="POST" action="/new/post" class="input-group">
<input class="form-control" name="title" id="title" placeholder="Title">
<span class="input-group-btn"><button type="submit" class="btn btn-success"><i class="fa fa-file-o"></i> Create Post</button></span>
</form>
<div class="list-group">
% for p in site.posts:
<div class="list-group-item">
<h3 class="media-heading">${p.title()}</h3>
<small>Date: ${p.date}</small>
<br><small>Author: ${p.meta('author')}</small>
<div class="pull-right">
<a class="btn btn-info btn-xs" href="/edit/${p.source_path}"><span class="fa fa-pencil"></span> Edit</a>
<a class="btn btn-danger btn-xs" href="/delete/${p.source_path}"><span class="fa fa-trash"></span> Delete</a>
<button type="button" class="btn btn-danger btn-xs" data-toggle="modal" data-target="#deleteModal" data-sourcepath="${p.source_path}" data-ptitle="${p.title()}"><span class="fa fa-trash"></span> Delete</a>
</div>
</div>
% endfor
</div>
<div class="post_holder"></div>
</div>

<div class="col-md-6">
<h2 style="text-align: center;">Pages</h2>
<form method="POST" action="/new/page" class="input-group">
<input class="form-control" name="title" id="title" placeholder="Title">
<span class="input-group-btn"><button type="submit" class="btn btn-success"><i class="fa fa-file-o"></i> Create Page</button></span>
</form>
<div class="page_holder"></div>
<div class="list-group" id="page_container">
<div class="list-group">
% for p in site.pages:
<div class="list-group-item">
<h3 class="media-heading">${p.title()}</h3>
<small>Date: ${p.date}</small>
<br><small>Author: ${p.meta('author')}</small>
<div class="pull-right">
<a class="btn btn-info btn-xs" href="/edit/${p.source_path}"><span class="fa fa-pencil"></span> Edit</a>
<a class="btn btn-danger btn-xs" href="/delete/${p.source_path}"><span class="fa fa-trash"></span> Delete</a>
<button type="button" class="btn btn-danger btn-xs" data-toggle="modal" data-target="#deleteModal" data-sourcepath="${p.source_path}" data-ptitle="${p.title()}"><span class="fa fa-trash"></span> Delete</a>
</div>
</div>
% endfor
Expand All @@ -141,17 +68,23 @@
</div>
</div>

</form>
<script type="text/javascript">
$(function(){
$("div.post_holder").jPages({
containerID : "post_container",
perPage: 5
});
$("div.page_holder").jPages({
containerID : "page_container",
perPage: 5
});
});
</script>
<div class="modal fade" id="deleteModal" tabindex="-1" role="dialog" aria-labelledby="deleteModalLabel" aria-hidden="true">
<div class="modal-dialog">
<div class="modal-content">
<div class="modal-header">
<button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>
<h4 class="modal-title" id="deleteModalLabel">Confirm deletion</h4>
</div>
<div class="modal-body">
Really delete <span class="del-title">post</span>?
</div>
<div class="modal-footer">
<form method="POST" action="/delete" class="delete-button">
<input type="hidden" name="path" class="sourcepath">
<button type="button" class="btn btn-default" data-dismiss="modal">Cancel</button>
<button type="submit" class="btn btn-danger">Delete</button>
</div>
</div>
</div>
</div>
</%block>
52 changes: 0 additions & 52 deletions plugins/webapp/templates/mako/webapp_post_delete.tmpl
View file

This file was deleted.

58 changes: 10 additions & 48 deletions plugins/webapp/templates/mako/webapp_post_edit.tmpl
View file
@@ -1,55 +1,17 @@
<%inherit file="base.tmpl"/>
<%block name="extra_head">
<link href="//maxcdn.bootstrapcdn.com/font-awesome/4.2.0/css/font-awesome.min.css" rel="stylesheet">

<style>
#toolbar, #post-meta-panel, #content-area {
margin-top: 10px;
}
</style>
</%block>
<%block name="content">
<!-- New Page Modal -->
<div class="modal fade" id="newPage" tabindex="-1" role="dialog" aria-labelledby="newPageLabel" aria-hidden="true">
<form method="POST" action="/new/page">
<div class="modal-dialog">
<div class="modal-content">
<div class="modal-header">
<button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
<h4 class="modal-title" id="newPageLabel">Create New Page?</h4>
</div>
<div class="modal-body">
<input class="form-control" name="title" id="title" placeholder="Title">
</div>
<div class="modal-footer">
<button type="button" class="btn btn-default" data-dismiss="modal">Close</button>
<button type="submit" class="btn btn-primary">Create Page</button>
</div>
</div>
</div>
</form>
</div>

<!-- New Post Modal -->
<div class="modal fade" id="newPost" tabindex="-1" role="dialog" aria-labelledby="newPostLabel" aria-hidden="true">
<form method="POST" action="/new/post">
<div class="modal-dialog">
<div class="modal-content">
<div class="modal-header">
<button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
<h4 class="modal-title" id="newPostLabel">Create New Post?</h4>
</div>
<div class="modal-body">
<input class="form-control" name="title" id="title" placeholder="Title">
</div>
<div class="modal-footer">
<button type="button" class="btn btn-default" data-dismiss="modal">Close</button>
<button type="submit" class="btn btn-primary">Create Post</button>
</div>
</div>
</div>
</form>
</div>


<form method="POST" class="form-horizontal" role="form" id="form" action="/save/${post.source_path}">
<input name="title" value="${post.title()}" class="form-control title"
placeholder="Title" style="font-size: 36px; height: auto;">
<div id="toolbar" class="btn-toolbar" style="margin-top: 10px;">
<input name="title" value="${post.title()}" class="form-control title input-lg" placeholder="Title">
<div id="toolbar" class="btn-toolbar">
<div class="btn-group">
<button type="submit" class="btn btn-sm btn-primary"><i class="fa fa-save"></i> Save</button>
<button class="btn btn-sm btn-info" type="button" data-toggle="collapse"
Expand Down Expand Up @@ -110,7 +72,7 @@ placeholder="Title" style="font-size: 36px; height: auto;">
</div>
</div>
<div class="collapse" id="post-meta">
<div class="panel panel-info" style="margin-top: 10px;">
<div class="panel panel-info" id="post-meta-panel">
<div class="panel-heading">
<h3 class="panel-title">Metadata</h3>
</div>
Expand All @@ -129,7 +91,7 @@ placeholder="Title" style="font-size: 36px; height: auto;">
</div>
</div>

<textarea name="content" id="content-area" class="form-control" rows="24" style="margin-top: 10px;">${open(path).read().split('\n\n', 1)[1]}</textarea>
<textarea name="content" id="content-area" class="form-control" rows="24">${open(path).read().split('\n\n', 1)[1]}</textarea>
</form>
<script src="/wysihtml/dist/wysihtml5x-toolbar.min.js"></script>
<script src="/wysihtml/parser_rules/advanced_and_extended.js"></script>
Expand Down
43 changes: 0 additions & 43 deletions plugins/webapp/templates/mako/webapp_profile.tmpl
View file
Expand Up @@ -3,49 +3,6 @@
<link href="//maxcdn.bootstrapcdn.com/font-awesome/4.2.0/css/font-awesome.min.css" rel="stylesheet">
</%block>
<%block name="content">
<!-- New Page Modal -->
<div class="modal fade" id="newPage" tabindex="-1" role="dialog" aria-labelledby="newPageLabel" aria-hidden="true">
<form method="POST" action="/new/page">
<div class="modal-dialog">
<div class="modal-content">
<div class="modal-header">
<button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
<h4 class="modal-title" id="newPageLabel">Create New Page?</h4>
</div>
<div class="modal-body">
<input class="form-control" name="title" id="title" placeholder="Title">
</div>
<div class="modal-footer">
<button type="button" class="btn btn-default" data-dismiss="modal">Close</button>
<button type="submit" class="btn btn-primary">Create Page</button>
</div>
</div>
</div>
</form>
</div>

<!-- New Post Modal -->
<div class="modal fade" id="newPost" tabindex="-1" role="dialog" aria-labelledby="newPostLabel" aria-hidden="true">
<form method="POST" action="/new/post">
<div class="modal-dialog">
<div class="modal-content">
<div class="modal-header">
<button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
<h4 class="modal-title" id="newPostLabel">Create New Post?</h4>
</div>
<div class="modal-body">
<input class="form-control" name="title" id="title" placeholder="Title">
</div>
<div class="modal-footer">
<button type="button" class="btn btn-default" data-dismiss="modal">Close</button>
<button type="submit" class="btn btn-primary">Create Post</button>
</div>
</div>
</div>
</form>
</div>


<h1 class="title">Editing profile <tt>${USERNAME}</tt></h1>

<form action="/profile/save" method="POST">
Expand Down

0 comments on commit e9a618d

Please sign in to comment.