From 02c2bc80c76440e849a73e9e7b58f1051f3cc47d Mon Sep 17 00:00:00 2001
From: Roberto Sánchez <roberto.sanchez@curisit.net>
Date: Wed, 08 Jan 2014 18:11:31 +0000
Subject: [PATCH] #394 feature - Added quick filter to listing
---
securis/src/main/resources/static/admin.html | 36 +++++++++++++++++++++---------------
1 files changed, 21 insertions(+), 15 deletions(-)
diff --git a/securis/src/main/resources/static/admin.html b/securis/src/main/resources/static/admin.html
index 5c6f344..07a95a3 100644
--- a/securis/src/main/resources/static/admin.html
+++ b/securis/src/main/resources/static/admin.html
@@ -52,6 +52,8 @@
margin-bottom: 5px;
}
+
+
</style>
<link rel="stylesheet"
href="//cdnjs.cloudflare.com/ajax/libs/twitter-bootstrap/3.0.3/css/bootstrap-theme.min.css">
@@ -109,15 +111,13 @@
class="glyphicon glyphicon-ban-circle"></span> Cancel
</a></li>
</ul>
- <form class="navbar-form navbar-right" role="search">
- <div class="form-group">
- <input type="text" class="form-control" placeholder="Search" ng-model="searchText">
- </div>
- <button type="submit" class="btn btn-default">
- <span class="glyphicon glyphicon-search"></span>
-
- </button>
- </form>
+ <div class="navbar-form navbar-right">
+ <div class="input-group input-group-sm">
+ <span class="input-group-addon glyphicon glyphicon-search" style="top: 0px;"></span>
+ <input type="text" class="form-control" placeholder="Search" ng-model="$parent.searchText" >
+ <span class="btn input-group-addon glyphicon glyphicon-remove" ng-click="$parent.searchText = ''" style="top: 0px;"></span>
+ </div>
+ </div>
</div>
</nav>
<div class="panel panel-default animate-show ng-hide" ng-show="showForm">
@@ -126,12 +126,18 @@
<div class="form-group" ng-repeat="field in catalogMetadata.fields" ng-if="!isNew || !field.readOnly">
<label class="col-md-3 control-label" for="{{field.name}}">{{field.display}}</label>
<div class="col-md-5">
- <input catalog-field ng-if="!field.readOnly && !field.multiline" type="{{field.type}}" id="{{field.name}}" name="{{field.name}}" placeholder=""
- class="form-control" ng-model="formu[field.name]" ng-required="field.mandatory" ng-maxlength="{{field.maxlength}}" />
- <textarea catalog-field ng-if="!field.readOnly && field.multiline" type="{{field.type}}" id="{{field.name}}" name="{{field.name}}" placeholder=""
- class="form-control" ng-model="formu[field.name]" rows="{{field.multiline}}" ng-required="field.mandatory" ng-maxlength="{{field.maxlength}}"></textarea>
- <p ng-if="field.readOnly" class="form-control-static">{{formu[field.name]}}</p>
-
+ <div ng-switch on="inputType(field)">
+ <input catalog-field ng-switch-when="normal" type="{{field.type}}" id="{{field.name}}" name="{{field.name}}" placeholder=""
+ class="form-control" ng-model="formu[field.name]" ng-required="field.mandatory" ng-maxlength="{{field.maxlength}}" />
+ <textarea catalog-field ng-switch-when="textarea" type="{{field.type}}" id="{{field.name}}" name="{{field.name}}" placeholder=""
+ class="form-control" ng-model="formu[field.name]" rows="{{field.multiline}}" ng-required="field.mandatory" ng-maxlength="{{field.maxlength}}"></textarea>
+ <p ng-switch-when="readonly" class="form-control-static">{{formu[field.name]}}</p>
+ <p ng-switch-when="readonly_date" class="form-control-static">{{formu[field.name] | date:'medium'}}</p>
+ <select ng-switch-when="select" class="form-control" ng-required="field.mandatory" ng-model="formu[field.name]"
+ ng-options="o.id as o.label for o in refs[field.name]">
+ </select>
+
+ </div>
<div class="alert inline-alert alert-warning" ng-show="catalogForm[field.name].$invalid">
<span class="glyphicon glyphicon-warning-sign"></span>
<span ng-show="catalogForm[field.name].$error.maxlength">{{field.display}} length is too long (max: {{field.maxlength}}).<br/></span>
--
Gitblit v1.3.2