Skip to content

Commit

Permalink
Merge branch 'dev'
Browse files Browse the repository at this point in the history
  • Loading branch information
h.woltersdorf committed Feb 3, 2016
2 parents 4d64f7d + c38ed5d commit c4c12eb
Show file tree
Hide file tree
Showing 3 changed files with 93 additions and 80 deletions.
5 changes: 5 additions & 0 deletions CHANGELOG
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
# CHANGELOG

## Changes in Version 1.1.1

* Number of database is displayed, even when an expressive name is mapped
* Fixed missing whitespace in default database name

## Changes in Version 1.1.0

* Added database mapping for more expressive database names. See [README](./README.md) for more details.
166 changes: 87 additions & 79 deletions src/Pages/Includes/Keys.twig
View file
Original file line number Diff line number Diff line change
@@ -1,87 +1,95 @@
<div class="container">

<div class="row">
<div class="col-md-11 col-md-5">
<div class="btn-group" role="group" id="database-select">
<button class="btn btn-default dropdown-toggle" type="button" data-toggle="dropdown"
aria-haspopup="true"
aria-expanded="false">
<span id="current-db">
{{ databaseMap[0]|default('Database 0') }}
{% if serverInfo["db0"] is not empty %}
<span class="small text-muted">({{ serverInfo["db0"] }})</span>
{% else %}
<span class="small text-muted">(empty)</span>
{% endif %}
</span>
<span class="caret"></span>
</button>
<ul class="dropdown-menu" role="menu">
{% for i in 0..serverConfig.databases-1 %}
<li>
<a data-database="{{ i }}">
{{ databaseMap[i]|default('Database' ~ i) }}
{% if serverInfo["db"~i] is not empty %}
<span class="small text-muted">({{ serverInfo["db"~i] }})</span>
{% else %}
<span class="small text-muted">(empty)</span>
{% endif %}
</a>
</li>
{% endfor %}
</ul>
</div>
</div>
<div class="hidden-sm col-md-2">
<div class="pull-right" style="padding: 5px; display:none;" id="ajaxSpinner">
<span class="throbber-loader"></span>
</div>
</div>
<div class="col-sm-11 col-md-4">
<form action="{{ appConfig.getBaseUrl }}/database/ajax-search-keys" id="key-select-form"
role="form" method="get">
<input type="hidden" name="serverKey" value="{{ serverKey }}">
<input type="hidden" name="database" value="0">
<input type="hidden" name="limit" value="100">
<div class="row">
<div class="col-md-11 col-md-5">
<div class="btn-group" role="group" id="database-select">
<button class="btn btn-default dropdown-toggle" type="button" data-toggle="dropdown"
aria-haspopup="true"
aria-expanded="false">
<span id="current-db">
{% if databaseMap[0] is not empty %}
<span class="text-muted">0:</span> {{ databaseMap[0] }}
{% else %}
Database 0
{% endif %}
{% if serverInfo["db0"] is not empty %}
<span class="small text-muted">({{ serverInfo["db0"] }})</span>
{% else %}
<span class="small text-muted">(empty)</span>
{% endif %}
</span>
<span class="caret"></span>
</button>
<ul class="dropdown-menu" role="menu">
{% for i in 0..serverConfig.databases-1 %}
<li>
<a data-database="{{ i }}">
{% if databaseMap[i] is not empty %}
<span class="text-muted">{{ i }}:</span> {{ databaseMap[i] }}
{% else %}
Database {{ i }}
{% endif %}
{% if serverInfo["db"~i] is not empty %}
<span class="small text-muted">({{ serverInfo["db"~i] }})</span>
{% else %}
<span class="small text-muted">(empty)</span>
{% endif %}
</a>
</li>
{% endfor %}
</ul>
</div>
</div>
<div class="hidden-sm col-md-2">
<div class="pull-right" style="padding: 5px; display:none;" id="ajaxSpinner">
<span class="throbber-loader"></span>
</div>
</div>
<div class="col-sm-11 col-md-4">
<form action="{{ appConfig.getBaseUrl }}/database/ajax-search-keys" id="key-select-form"
role="form" method="get">
<input type="hidden" name="serverKey" value="{{ serverKey }}">
<input type="hidden" name="database" value="0">
<input type="hidden" name="limit" value="100">

<div class="input-group">
<span class="input-group-addon">
<span class="glyphicon glyphicon-info-sign"
data-toggle="tooltip"
data-original-title="Search is case sensitive, use * as placeholder"
data-trigger="hover"></span>
</span>
<label for="searchPattern" class="sr-only">Key search pattern</label>
<input type="text" name="searchPattern" id="searchPattern" value="" class="form-control"
placeholder="Search for keys">
<div class="input-group">
<span class="input-group-addon">
<span class="glyphicon glyphicon-info-sign"
data-toggle="tooltip"
data-original-title="Search is case sensitive, use * as placeholder"
data-trigger="hover"></span>
</span>
<label for="searchPattern" class="sr-only">Key search pattern</label>
<input type="text" name="searchPattern" id="searchPattern" value="" class="form-control"
placeholder="Search for keys">

<div class="input-group-btn" id="limit-select">
<button type="submit" class="btn btn-primary">
Search
</button>
<button class="btn btn-default dropdown-toggle" type="button" data-toggle="dropdown"
aria-haspopup="true"
aria-expanded="false">
<span id="current-limit">
Limit: 100
</span>
<span class="caret"></span>
</button>
<ul class="dropdown-menu" role="menu">
<li><a data-limit="50">Limit: 50</a></li>
<li><a data-limit="100">Limit: 100</a></li>
<li><a data-limit="250">Limit: 250</a></li>
<li><a data-limit="500">Limit: 500</a></li>
<li><a data-limit="1000">Limit: 1000</a></li>
<li><a data-limit="2500">Limit: 2500</a></li>
<li><a data-limit="all">Limit: all</a></li>
</ul>
</div>
</div>
<div class="input-group-btn" id="limit-select">
<button type="submit" class="btn btn-primary">
Search
</button>
<button class="btn btn-default dropdown-toggle" type="button" data-toggle="dropdown"
aria-haspopup="true"
aria-expanded="false">
<span id="current-limit">
Limit: 100
</span>
<span class="caret"></span>
</button>
<ul class="dropdown-menu" role="menu">
<li><a data-limit="50">Limit: 50</a></li>
<li><a data-limit="100">Limit: 100</a></li>
<li><a data-limit="250">Limit: 250</a></li>
<li><a data-limit="500">Limit: 500</a></li>
<li><a data-limit="1000">Limit: 1000</a></li>
<li><a data-limit="2500">Limit: 2500</a></li>
<li><a data-limit="all">Limit: all</a></li>
</ul>
</div>
</div>

</form>
</div>
</div>
</form>
</div>
</div>

</div>

Expand Down
2 changes: 1 addition & 1 deletion src/Pages/Theme.twig
View file
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@
Version
</div>
<div class="col-xs-offset-1 col-xs-6">
1.0.0
1.1.1
</div>
</div>
<div class="row">
Expand Down

0 comments on commit c4c12eb

Please sign in to comment.