twisterarmy
/
swizzler
mirror of https://github.com/twisterarmy/swizzler.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

Nav pill header for home/mentions/messages 

The previous gui looked too sloppy
master
The Dod 11 years ago
parent
ec238a0150
commit
6cd46b6ec1
4 changed files with 117 additions and 114 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      swizzler.py
  2. 44
      templates/messages.html
  3. 8
      templates/sidebar.html
  4. 61
      templates/standard.html

2
swizzler.py
Unescape View File

@ -56,7 +56,7 @@ class SwizzlerApp(object):
result['user_prefix'] = userprefix result['user_prefix'] = userprefix
result['users'] = twister.get_users_by_partial_name(userprefix[1:],conf['num_messages']) result['users'] = twister.get_users_by_partial_name(userprefix[1:],conf['num_messages'])
else: else:
result['trending'] = format_trending(twister,conf['num_messages']) result['trending'] = format_trending(twister,3*conf['num_messages']) # no avatar = about 1/3 height :)
return stache.render(stache.load_template('search'),result) return stache.render(stache.load_template('search'),result)
@cherrypy.expose @cherrypy.expose

44
templates/messages.html
Unescape View File

@ -14,31 +14,39 @@
<div class="container"> <div class="container">
<div class="row"> <div class="row">
<div id="main" class="col-md-8"> <div id="main" class="col-md-8">
<div class="row">
<div id="header" class="col-md-12 well">
{{#subject}} {{#subject}}
<div class="media"> <div class="panel panel-primary">
<div class="panel-heading">
<h3 class="panel-title">
<span class="glyphicon glyphicon-envelope"></span> Direct messages: {{fullname}}
{{#remoteuser}}<span class="glyphicon glyphicon-transfer"></span> {{fullname}}{{/remoteuser}}
</h3>
</div>
<div class="panel-body">
<div class="media avatars32">
<a class="pull-left thumbnail" href="{{site_root}}/user/{{username}}"> <a class="pull-left thumbnail" href="{{site_root}}/user/{{username}}">
<img class="media-object avatar" src="{{#avatar}}{{.}}{{/avatar}}{{^avatar}}/assets/img/twister-64.jpg{{/avatar}}" alt="{{fullname}}"> <img class="media-object avatar" src="{{avatar}}" alt="{{fullname}}">
</a> </a>
<div class="media-body"> <div class="media-body">
<h3 class="media-heading"> <ul class="nav nav-pills">
<a class="label label-primary" href="{{site_root}}/messages/{{username}}{{#remoteuser}}/{{username}}{{/remoteuser}}" <li{{#is_feed}} class="active"{{/is_feed}}>
title="@{{username}}'s messages{{#remoteuser}} with {{username}}{{/remoteuser}}" <a href="{{site_root}}/home/{{username}}"
><span class="glyphicon glyphicon-envelope"></span> title="@{{username}}'s home"><span class="glyphicon glyphicon-home"></span>Home</a>
{{fullname}}'s direct messages </li>
{{#remoteuser}}with {{fullname}}{{/remoteuser}}</a> <li{{#is_mentions}} class="active"{{/is_mentions}}>
</h3> <a href="{{site_root}}/home/{{username}}/mentions"
<h4> title="mentions of @{{username}}"><span class="glyphicon glyphicon-bell"></span>Mentions</a>
<a class="label label-primary" href="{{site_root}}/home/{{username}}" title="@{{username}}'s home"><span class="glyphicon glyphicon-home"></span> Home</a> </li>
<a class="label label-primary" href="{{site_root}}/home/{{username}}/mentions" title="mentions of @{{username}}"><span class="glyphicon glyphicon-bell"></span> Mentions</a> <li {{^remoteuser}}class="active"{{/remoteuser}}>
<a class="label label-info" href="{{site_root}}/user/{{username}}" title="@{{username}}'s profile"><span class="glyphicon glyphicon-user"></span> Profile</a> <a href="{{site_root}}/messages/{{username}}"
</h4> title="direct messages from/to @{{username}}"><span class="glyphicon glyphicon-envelope"></span>Messages</a>
</li>
</ul>
</div> </div>
</div> </div>
{{/subject}}
</div> </div>
</div> </div>
{{/subject}}
<div class="row"> <div class="row">
<div id="messages" class="col-md-12"> <div id="messages" class="col-md-12">
{{#any_threads}} {{#any_threads}}
@ -67,7 +75,7 @@
<h4><small>Nothing. Nada. Rien de rien. &#128557;</small></h4> <h4><small>Nothing. Nada. Rien de rien. &#128557;</small></h4>
{{/threads}} {{/threads}}
</div> </div>
</div> </div><!-- /.row -->
</div> </div>
<div id="sidebar" class="col-md-4"> <div id="sidebar" class="col-md-4">
{{> sidebar}} {{> sidebar}}

8
templates/sidebar.html
Unescape View File

@ -35,16 +35,16 @@
<form method=get action="{{site_root}}/tag" class="form-horizontal" role="search"> <form method=get action="{{site_root}}/tag" class="form-horizontal" role="search">
<div class="form-group"> <div class="form-group">
<label class="col-xs-4 text-right" for="#tag">Tag <span class="glyphicon glyphicon-tag"></span></label> <label class="col-sm-4" for="#tag"><span class="badge pull-right">Tag <span class="glyphicon glyphicon-tag"></span></span></label>
<div class="col-xs-8"> <div class="col-sm-8">
<input id="tag" name="tag" type="text" class="form-control input-sm" placeholder="#twister"{{#user_prefix}} value="{{.}}"{{/user_prefix}}> <input id="tag" name="tag" type="text" class="form-control input-sm" placeholder="#twister"{{#user_prefix}} value="{{.}}"{{/user_prefix}}>
</div> </div>
</div> </div>
</form> </form>
<form target="searchresult" tag="searchresult" method=get action="{{site_root}}/search_embed" class="form-horizontal" role="search"> <form target="searchresult" tag="searchresult" method=get action="{{site_root}}/search_embed" class="form-horizontal" role="search">
<div class="form-group"> <div class="form-group">
<label class="col-xs-4 text-right" for="#userprefix">Usernam... <span class="glyphicon glyphicon-user"></span></label> <label class="col-sm-4" for="#userprefix"><span class="badge pull-right">Userna... <span class="glyphicon glyphicon-user"></span></span></label>
<div class="col-xs-8"> <div class="col-sm-8">
<input id="userprefix" name="userprefix" type="text" class="form-control input-sm" placeholder="@twi"{{#user_prefix}} value="{{.}}"{{/user_prefix}}> <input id="userprefix" name="userprefix" type="text" class="form-control input-sm" placeholder="@twi"{{#user_prefix}} value="{{.}}"{{/user_prefix}}>
</div> </div>
</div> </div>

61
templates/standard.html
Unescape View File

@ -14,50 +14,46 @@
<div class="container"> <div class="container">
<div class="row"> <div class="row">
<div id="main" class="col-md-8"> <div id="main" class="col-md-8">
<div class="row"> {{#is_home}}{{#subject}}
{{#is_home}}
<div class="panel panel-primary"> <div class="panel panel-primary">
<div class="panel-heading"> <div class="panel-heading">
{{#username}}
<h3 class="panel-title"> <h3 class="panel-title">
{{#is_feed}} {{#is_feed}}<span class="glyphicon glyphicon-home"></span> Home: {{fullname}}{{/is_feed}}
<a class="label label-primary" href="{{site_root}}/home/{{username}}" title="@{{username}}'s home"><span class="glyphicon glyphicon-home"></span> {{#is_mentions}}<span class="glyphicon glyphicon-bell"></span> Mentions of {{fullname}}{{/is_mentions}}
{{fullname}}'s home</a>
{{/is_feed}}
{{#is_mentions}}
<a class="label label-primary" href="{{site_root}}/home/{{username}}/mentions" title="mentions of @{{username}}"><span class="glyphicon glyphicon-bell"></span>
Mentions of {{fullname}}</a>
{{/is_mentions}}
{{#is_messages}}
<a class="label label-primary" href="{{site_root}}/messages/{{username}}" title="direct messages to/from @{{username}}"><span class="glyphicon glyphicon-envelope"></span>
{{fullname}}</a>
{{/is_messages}}
</h3> </h3>
{{/username}}
{{^username}}
{{/username}}
</div> </div>
<div class="panel-body"> <div class="panel-body">
<h4> <div class="media avatars32">
{{^is_feed}} <a class="pull-left thumbnail" href="{{site_root}}/user/{{username}}"
<a class="label label-primary" href="{{site_root}}/home/{{username}}" title="@{{username}}'s home"><span class="glyphicon glyphicon-home"></span>Home</a> title="@{{username}}'s profile">
{{/is_feed}} <img class="media-object avatar" src="{{avatar}}" alt="{{fullname}}">
{{^is_mentions}} </a>
<a class="label label-primary" href="{{site_root}}/home/{{username}}/mentions" title="mentions of @{{username}}"><span class="glyphicon glyphicon-bell"></span>Mentions</a> <div class="media-body">
{{/is_mentions}} <ul class="nav nav-pills">
{{^is_messages}} <li{{#is_feed}} class="active"{{/is_feed}}>
<a class="label label-primary" href="{{site_root}}/messages/{{username}}" title="direct messages from/to @{{username}}"><span class="glyphicon glyphicon-envelope"></span>Messages</a> <a href="{{site_root}}/home/{{username}}"
{{/is_messages}} title="@{{username}}'s home"><span class="glyphicon glyphicon-home"></span>Home</a>
<a class="label label-info" href="{{site_root}}{{#username}}/user/{{.}}{{/username}}" title="@{{username}}'s profile"><span class="glyphicon glyphicon-user"></span>Profile</a> </li>
</h4> <li{{#is_mentions}} class="active"{{/is_mentions}}>
<a href="{{site_root}}/home/{{username}}/mentions"
title="mentions of @{{username}}"><span class="glyphicon glyphicon-bell"></span>Mentions</a>
</li>
<li>
<a href="{{site_root}}/messages/{{username}}"
title="direct messages from/to @{{username}}"><span class="glyphicon glyphicon-envelope"></span>Messages</a>
</li>
</ul>
</div> </div>
</div> </div>
{{/is_home}} </div>
</div>
{{/subject}}{{/is_home}}
{{^is_home}} {{^is_home}}
<div id="header" class="col-md-12 well"> <div id="header" class="col-md-12 well">
{{#subject}} {{#subject}}
<div class="media"> <div class="media">
<a class="pull-left thumbnail" href="{{#username}}/user/{{.}}{{/username}}{{^username}}#{{/username}}"> <a class="pull-left thumbnail" href="{{site_root}}{{#username}}/user/{{.}}{{/username}}{{^username}}#{{/username}}"
{{#username}}title="@{{usermame}}'s profile"{{/username}}>
<img class="media-object avatar" src="{{#avatar}}{{.}}{{/avatar}}{{^avatar}}/assets/img/twister-64.jpg{{/avatar}}" alt="{{fullname}}"> <img class="media-object avatar" src="{{#avatar}}{{.}}{{/avatar}}{{^avatar}}/assets/img/twister-64.jpg{{/avatar}}" alt="{{fullname}}">
</a> </a>
<div class="media-body"> <div class="media-body">
@ -80,7 +76,6 @@
{{/subject}} {{/subject}}
</div> </div>
{{/is_home}} {{/is_home}}
</div><!-- /.row -->
<div class="row"> <div class="row">
<div id="messages" class="col-md-12"> <div id="messages" class="col-md-12">
{{#any_messages}}<ul class="list-group media-list">{{#messages}}{{> message}}{{/messages}}</ul>{{/any_messages}} {{#any_messages}}<ul class="list-group media-list">{{#messages}}{{> message}}{{/messages}}</ul>{{/any_messages}}

Write Preview
Loading…
Cancel
Save