Skip to content

U
ulakbus-ui
Commit 673c9fb0 authored by Evren Kutar's avatar Evren Kutar
Browse files
Options

Merge branch 'UI-Improvements-3'

parents 55121dad 52f6af6a
Hide whitespace changes
Inline Side-by-side
Showing with 94 additions and 88 deletions
app/app.css
View file @ 673c9fb0
...@@ -74,6 +74,23 @@ a:hover { ...@@ -74,6 +74,23 @@ a:hover {
margin-bottom: 0; margin-bottom: 0;
} }
.buttons-on-bottom {
float:left;
}
.filter-inner {
background-color: #fff;
padding: 15px;
margin-top: 104px;
border: 1px solid #E6E6E6;
}
.filter-inner h4 {
font-family: 'robotobold';
color: #333;
letter-spacing: 0.5px;
}
/** BRAND **/ /** BRAND **/
.brand-bg { .brand-bg {
...@@ -557,6 +574,7 @@ select { ...@@ -557,6 +574,7 @@ select {
margin:10px auto; margin:10px auto;
float:left; float:left;
margin-right:10px; margin-right:10px;
border: 1px solid #E4E4E4;
} }
.sidebar-person-info .identity p.identity-name { .sidebar-person-info .identity p.identity-name {
...@@ -1463,7 +1481,6 @@ table.dataTable thead .sorting:after { ...@@ -1463,7 +1481,6 @@ table.dataTable thead .sorting:after {
padding: 15px; padding: 15px;
width:100%; width:100%;
text-align:center; text-align:center;
background: whitesmoke;
} }
footer span { footer span {
...@@ -1552,6 +1569,10 @@ table.dataTable thead .sorting:after { ...@@ -1552,6 +1569,10 @@ table.dataTable thead .sorting:after {
} }
@media (max-width: 1000px) { @media (max-width: 1000px) {
.personnel-info-container { .personnel-info-container {
width:500px; width:500px;
...@@ -1599,7 +1620,7 @@ table.dataTable thead .sorting:after { ...@@ -1599,7 +1620,7 @@ table.dataTable thead .sorting:after {
.tablescroll{ .tablescroll{
width: 100%; width: 100%;
overflow-x:scroll; overflow-x:auto;
overflow-y:visible; overflow-y:visible;
padding-bottom:1px; padding-bottom:1px;
} }
......
app/components/crud/templates/filter.html
View file @ 673c9fb0
<div style="background: white;"> <div>
<h4>Filtrele</h4> <div class="filter-inner">
<hr> <h4>Filtrele</h4>
<hr>
<div ng-repeat="filter in list_filters">
<div> <div ng-repeat="filter in list_filters">
<div class=" clearfix"> <div>
<h5 ng-click="collapseFilter(filter.field)">{{filter.verbose_name}} <div class=" clearfix">
<i class="fa fa-fw fa-caret-down"></i></h5> <h5 ng-click="collapseFilter(filter.field)">{{filter.verbose_name}}
</div> <i class="fa fa-fw fa-caret-down"></i></h5>
<div ng-if="filter.type==='check' || !filter.type" uib-collapse="filterCollapsed[filter.field]">
<div class="checkbox" ng-repeat="filterItem in filter.values">
<label class="checkbox-inline">
<input type="checkbox" name="filter_group[]" ng-model="filterList[filter.field].model[filterItem.value]"
value="{{filterItem.value}}"/>
{{filterItem.name}}
</label>
</div> </div>
</div>
<div ng-if="filter.type==='check' || !filter.type" uib-collapse="filterCollapsed[filter.field]">
<div ng-if="filter.type==='select'" uib-collapse="filterCollapsed[filter.field]"> <div class="checkbox" ng-repeat="filterItem in filter.values">
<div class="col-md-12"> <label class="checkbox-inline">
<select name="filterSelect" id="filterSelect" class="form-control"> <input type="checkbox" name="filter_group[]" ng-model="filterList[filter.field].model[filterItem.value]"
<option ng-repeat="filterItem in filter.values" value="{{filterItem.value}}"> value="{{filterItem.value}}"/>
{{filterItem.name}} {{filterItem.name}}
</option> </label>
</select> </div>
</div> </div>
</div>
<div ng-if="filter.type==='select'" uib-collapse="filterCollapsed[filter.field]">
<div ng-if="filter.type==='date'" uib-collapse="filterCollapsed[filter.field]"> <div class="col-md-12">
<div class="col-md-12"> <select name="filterSelect" id="filterSelect" class="form-control">
<label class="control-label" for="startDate">Başlangıç</label> <option ng-repeat="filterItem in filter.values" value="{{filterItem.value}}">
{{filterItem.name}}
<p class="input-group"> </option>
<span class="input-group-btn"> </select>
<button type="button" class="btn btn-default" ng-click="dateFilterOpen($event, 'startOpened')"> </div>
<i class="fa fa-calendar"></i>
</button>
</span>
<input type="text" name="startDate" class="form-control"
ng-model="filterList[filter.field].model[0]"
uib-datepicker-popup="{{format}}"
is-open="status.startOpened"
close-text="Kapat"
current-text="Bugün"
clear-text="Temizle"
ng-click="dateFilterOpen($event, 'startOpened')"/></p>
</div> </div>
<div class="col-md-12">
<label class="control-label" for="endDate">Bitiş</label> <div ng-if="filter.type==='date'" uib-collapse="filterCollapsed[filter.field]">
<div class="col-md-12">
<p class="input-group"> <label class="control-label" for="startDate">Başlangıç</label>
<span class="input-group-btn">
<button type="button" class="btn btn-default" ng-click="dateFilterOpen($event, 'endOpened')"> <p class="input-group">
<i class="fa fa-calendar"></i> <span class="input-group-btn">
</button> <button type="button" class="btn btn-default" ng-click="dateFilterOpen($event, 'startOpened')">
</span> <i class="fa fa-calendar"></i>
<input type="text" name="endDate" class="form-control" </button>
ng-model="filterList[filter.field].model[1]" </span>
uib-datepicker-popup="{{format}}" <input type="text" name="startDate" class="form-control"
is-open="status.endOpened" ng-model="filterList[filter.field].model[0]"
close-text="Kapat" uib-datepicker-popup="{{format}}"
current-text="Bugün" is-open="status.startOpened"
clear-text="Temizle" close-text="Kapat"
ng-click="dateFilterOpen($event, 'endOpened')"/></p> current-text="Bugün"
clear-text="Temizle"
ng-click="dateFilterOpen($event, 'startOpened')"/></p>
</div>
<div class="col-md-12">
<label class="control-label" for="endDate">Bitiş</label>
<p class="input-group">
<span class="input-group-btn">
<button type="button" class="btn btn-default" ng-click="dateFilterOpen($event, 'endOpened')">
<i class="fa fa-calendar"></i>
</button>
</span>
<input type="text" name="endDate" class="form-control"
ng-model="filterList[filter.field].model[1]"
uib-datepicker-popup="{{format}}"
is-open="status.endOpened"
close-text="Kapat"
current-text="Bugün"
clear-text="Temizle"
ng-click="dateFilterOpen($event, 'endOpened')"/></p>
</div>
</div> </div>
</div> </div>
</div> </div>
</div>
<div class="clearfix"></div>
<div class="clearfix"></div>
<div style="margin-top: 40px;">
<div style="margin-top: 40px;"> <button type="button" class="btn btn-warning" ng-click="filterSubmit()">Filtrele</button>
<button type="button" class="btn btn-warning" ng-click="filterSubmit()">Filtrele</button> </div>
</div> </div>
</div> </div>
\ No newline at end of file
app/components/crud/templates/list.html
View file @ 673c9fb0
...@@ -51,21 +51,6 @@ ...@@ -51,21 +51,6 @@
</table> </table>
</div> </div>
<br/> <br/>
<hr/>
<div class="btn-group" ng-if="objects[1]">
<button type="button" class="btn btn-info dropdown-toggle" data-toggle="dropdown" aria-haspopup="true"
aria-expanded="false">
İşlemler <span class="caret"></span>
</button>
<ul class="dropdown-menu">
<li><a href="">İşlem 1</a></li>
<li><a href="">İşlem 2</a></li>
<li><a href="">İşlem 3</a></li>
<li role="separator" class="divider"></li>
<li><a href="">İşlem 4</a></li>
</ul>
</div>
<nav ng-if="pagination && pagination.total_pages > 1" class="text-center"> <nav ng-if="pagination && pagination.total_pages > 1" class="text-center">
<ul class="pagination"> <ul class="pagination">
...@@ -86,6 +71,4 @@ ...@@ -86,6 +71,4 @@
</ul> </ul>
</nav> </nav>
<hr>
</div> </div>
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment