github-jwinterm/modoboa
1
0
Fork 0
mirror of https://github.com/jwinterm/modoboa.git synced 2026-10-17 05:41:25 +02:00
Code Issues Packages Projects Releases Wiki Activity

Chrome compliant menubar.

Browse Source 
see #585
This commit is contained in:
Antoine Nguyen
2014-10-16 22:00:25 +02:00
parent e373f00088
commit 8fe30c86ea
3 changed files with 69 additions and 68 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modoboa/extensions/amavis/static/amavis/css/quarantine.css
+1 -1
View File
@@ -30,7 +30,7 @@
#menubar {
position: absolute;
top: 51px;
padding-left: 6px;
padding-left: 15px;
padding-right: 15px;
padding-top: 20px;
padding-bottom: 10px;
modoboa/extensions/amavis/templates/amavis/main_action_bar.html
+31 -29
View File
@@ -1,37 +1,38 @@
{% load lib_tags i18n %}
<div class="row">
<div class="col-lg-9 col-md-8 col-xs-12">
<div class="navbar-nav">
<div class="btn-group" title="{% trans 'Select' %}">
<a class="btn btn-default"><input type="checkbox" id="selectall" /></a>
<button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown">
<span class="caret"></span>
</button>
<ul class="dropdown-menu">
<li><a name="selectmsgs" href="S">{% trans "Spam" %}</a></li>
<li><a name="selectmsgs" href="V">{% trans "Virus" %}</a></li>
<li><a name="selectmsgs" href="H">{% trans "Bad Header" %}</a></li>
<li><a name="selectmsgs" href="M">{% trans "Bad MIME" %}</a></li>
<li><a name="selectmsgs" href="B">{% trans "Banned" %}</a></li>
</ul>
</div>
<div class="btn-group">
<a name="release-multi" href="{% url 'amavis:mail_process' %}" class="btn btn-success disabled">
<span class="fa fa-check"></span> <span>{% trans "Release" %}</span>
</a>
</div>
<div class="btn-group">
<a name="delete-multi" href="{% url 'amavis:mail_process' %}" class="btn btn-danger disabled">
<span class="fa fa-trash"></span> <span>{% trans "Delete" %}</span>
</a>
</div>
<div class="btn-group">
{% include "common/email_searchbar.html" with extraopts=extraopts %}
</div>
<div class="col-xs-3">
<div class="btn-group" title="{% trans 'Select' %}">
<a class="btn btn-default"><input type="checkbox" id="selectall" /></a>
<button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown">
<span class="caret"></span>
</button>
<ul class="dropdown-menu">
<li><a name="selectmsgs" href="S">{% trans "Spam" %}</a></li>
<li><a name="selectmsgs" href="V">{% trans "Virus" %}</a></li>
<li><a name="selectmsgs" href="H">{% trans "Bad Header" %}</a></li>
<li><a name="selectmsgs" href="M">{% trans "Bad MIME" %}</a></li>
<li><a name="selectmsgs" href="B">{% trans "Banned" %}</a></li>
</ul>
</div>
<div class="btn-group" title="{% trans 'Release' %}">
<a name="release-multi" href="{% url 'amavis:mail_process' %}" class="btn btn-success disabled">
<span class="fa fa-check"></span> {% trans 'Release' %}
</a>
</div>
<div class="btn-group" title="{% trans 'Delete' %}">
<a name="delete-multi" href="{% url 'amavis:mail_process' %}" class="btn btn-danger disabled">
<span class="fa fa-trash"></span> {% trans 'Delete' %}
</a>
</div>
</div>
<div class="col-lg-3 col-md-4">
<div class="col-xs-4">
{% include "common/email_searchbar.html" with extraopts=extraopts %}
</div>
<div class="col-sm-5">
<div class="btn-group">
<div id="filters_bar" class="navbar-nav navbar-right">
<span class="label label-default">{% trans "Display" %}</span>
@@ -58,4 +59,5 @@
</div>
</div>
</div>
</div>
modoboa/templates/common/email_searchbar.html
+37 -38
View File
@@ -1,41 +1,40 @@
{% load i18n %}
<div id="searchbox" class="form-inline">
<div class="form-group">
<div class="input-group">
<input type="text" class="form-control" name="searchfield" id="searchfield" placeholder="{% trans "Search..." %}" />
<ul class="dropdown-menu pull-right" id="searchparams">
<li>
<div class="radio">
<label>
<input type="radio" id="crit_from_addr" name="scriteria" value="from_addr" checked> {% trans "From address" %}
</label>
</div>
</li>
<li>
<div class="radio">
<label>
<input type="radio" id="crit_subject" name="scriteria" value="subject"> {% trans "Subject" %}
</label>
</div>
</li>
{% for opt in extraopts %}
<li>
<div class="radio">
<label>
<input type="radio" id="crit_{{ opt.name }}" name="scriteria" value="{{ opt.name }}">{{ opt.label }}
</label>
</div>
</li>
{% endfor %}
<li>
<div class="radio">
<label>
<input type="radio" id="crit_both" name="scriteria" value="both">{% trans "Both" %}
</label>
</div>
</li>
</ul>
<a href="#" class="input-group-addon" data-toggle="dropdown"><span class="fa fa-search" id="searchopts"></span></a>
</div>
<div id="searchbox">
<div class="input-group">
<input type="text" class="form-control" name="searchfield"
id="searchfield" placeholder="{% trans "Search..." %}" />
<ul class="dropdown-menu pull-right" id="searchparams">
<li>
<div class="radio">
<label>
<input type="radio" id="crit_from_addr" name="scriteria" value="from_addr" checked> {% trans "From address" %}
</label>
</div>
</li>
<li>
<div class="radio">
<label>
<input type="radio" id="crit_subject" name="scriteria" value="subject"> {% trans "Subject" %}
</label>
</div>
</li>
{% for opt in extraopts %}
<li>
<div class="radio">
<label>
<input type="radio" id="crit_{{ opt.name }}" name="scriteria" value="{{ opt.name }}">{{ opt.label }}
</label>
</div>
</li>
{% endfor %}
<li>
<div class="radio">
<label>
<input type="radio" id="crit_both" name="scriteria" value="both">{% trans "Both" %}
</label>
</div>
</li>
</ul>
<a href="#" class="input-group-addon" data-toggle="dropdown"><span class="fa fa-search" id="searchopts"></span></a>
</div>
</div>