dhis2-devs team mailing list archive
-
dhis2-devs team
-
Mailing list archive
-
Message #30268
[Branch ~dhis2-devs-core/dhis2/trunk] Rev 15366: replaced blue tables in tracker capture with grey ones
------------------------------------------------------------
revno: 15366
committer: Abyot Asalefew Gizaw abyota@xxxxxxxxx
branch nick: dhis2
timestamp: Thu 2014-05-22 15:19:01 +0200
message:
replaced blue tables in tracker capture with grey ones
modified:
dhis-2/dhis-web/dhis-web-tracker-capture/src/main/webapp/dhis-web-tracker-capture/scripts/directives.js
dhis-2/dhis-web/dhis-web-tracker-capture/src/main/webapp/dhis-web-tracker-capture/styles/style.css
dhis-2/dhis-web/dhis-web-tracker-capture/src/main/webapp/dhis-web-tracker-capture/views/home.html
dhis-2/dhis-web/dhis-web-tracker-capture/src/main/webapp/dhis-web-tracker-capture/views/pagination.html
dhis-2/dhis-web/dhis-web-tracker-capture/src/main/webapp/dhis-web-tracker-capture/views/search.html
dhis-2/dhis-web/dhis-web-tracker-capture/src/main/webapp/dhis-web-tracker-capture/views/trackedEntityList.html
--
lp:dhis2
https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk
Your team DHIS 2 developers is subscribed to branch lp:dhis2.
To unsubscribe from this branch go to https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk/+edit-subscription
=== modified file 'dhis-2/dhis-web/dhis-web-tracker-capture/src/main/webapp/dhis-web-tracker-capture/scripts/directives.js'
--- dhis-2/dhis-web/dhis-web-tracker-capture/src/main/webapp/dhis-web-tracker-capture/scripts/directives.js 2014-05-21 16:13:41 +0000
+++ dhis-2/dhis-web/dhis-web-tracker-capture/src/main/webapp/dhis-web-tracker-capture/scripts/directives.js 2014-05-22 13:19:01 +0000
@@ -49,6 +49,7 @@
}
};
})
+
.directive('dhisContextMenu', function(ContextMenuSelectedItem) {
return {
=== modified file 'dhis-2/dhis-web/dhis-web-tracker-capture/src/main/webapp/dhis-web-tracker-capture/styles/style.css'
--- dhis-2/dhis-web/dhis-web-tracker-capture/src/main/webapp/dhis-web-tracker-capture/styles/style.css 2014-05-21 15:55:51 +0000
+++ dhis-2/dhis-web/dhis-web-tracker-capture/src/main/webapp/dhis-web-tracker-capture/styles/style.css 2014-05-22 13:19:01 +0000
@@ -421,8 +421,7 @@
.table-borderless>tbody>tr>td,
.table-borderless>tfoot>tr>td {
border-top: none;
- //background-color: #ebf0f6;
- padding-right: 8px;
+ padding: 5px;
}
.dhis2-table>thead>tr>th,
@@ -469,7 +468,6 @@
.dhis2-list-table-striped {
width: 100%;
- border: 1px solid #c2c2c2;
padding: 5px 10px;
table-layout: fixed;
}
@@ -489,6 +487,7 @@
.dhis2-table-hover > tbody > tr:hover > td, .table-hover > tbody > tr:hover > th {
background-color: #dfe9f4;
+ cursor: pointer;
}
#contextMenu {
@@ -598,6 +597,10 @@
padding: 20px 10px;
}
+.trim {
+ margin-bottom: 5px;
+ margin-top: 5px;
+}
/*----------------------------------------------------------------------------*/
/* Bootstrap modal style
/*----------------------------------------------------------------------------*/
=== modified file 'dhis-2/dhis-web/dhis-web-tracker-capture/src/main/webapp/dhis-web-tracker-capture/views/home.html'
--- dhis-2/dhis-web/dhis-web-tracker-capture/src/main/webapp/dhis-web-tracker-capture/views/home.html 2014-05-21 15:55:51 +0000
+++ dhis-2/dhis-web/dhis-web-tracker-capture/src/main/webapp/dhis-web-tracker-capture/views/home.html 2014-05-22 13:19:01 +0000
@@ -11,54 +11,53 @@
<div class="page" id="mainPage" ng-show="selectedOrgUnit">
<h1>
<span ng-if='showSearchDiv || !showRegistrationDiv'>
- {{'search'| translate}} {{selectedProgram.trackedEntity.name}}
+ {{'search'| translate}} {{selectedProgram.trackedEntity.name}}
</span>
<span ng-if='showRegistrationDiv'>
- {{'register'| translate}} {{selectedProgram.trackedEntity.name}}
+ {{'register'| translate}} {{selectedProgram.trackedEntity.name}}
</span>
<a href ng-click="getHelpContent()" title="{{'help'| translate}}"><i class="fa fa-question-circle"></i></a>
</h1>
-
- <div class="row">
- <input type="text" selected-org-unit ng-model="selectedOrgUnit.name" ng-hide=true>
+
+ <input type="text" selected-org-unit ng-model="selectedOrgUnit.name" ng-hide=true>
+ <div class="row">
<div class="input-group col-md-4">
<input type="text" placeholder="{{'your_search_input_here'| translate}}" ng-model="searchText" class="form-control" ng-class="{true: 'invalid - input'} [!searchText && emptySearchText]" ng-focus="hideSearch()" ng-disabled="showRegistrationDiv">
<span class="input-group-btn">
- <button class="btn btn-default" style="margin-bottom: 5px; margin-top: 5px;" type="button" title="{{'advanced_search'| translate}}" ng-click="showSearch()" ng-disabled="showRegistrationDiv"><i class="fa fa-cog"></i></button>
+ <button class="btn btn-default trim" type="button" title="{{'advanced_search'| translate}}" ng-click="showSearch()" ng-disabled="showRegistrationDiv"><i class="fa fa-caret-down"></i></button>
</span>
</div>
- <div class="col-md-8" style="margin-bottom: 5px; margin-top: 5px;">
+ <div class="col-md-3 trim">
<button type="button"
class="btn btn-default"
- ng-disabled="showRegistrationDiv || showSearchDiv"
+ ng-disabled="showRegistrationDiv"
ng-click="search(searchMode.freeText)">
{{'search'| translate}}
</button>
<button type="button"
class="btn btn-default small-horizonal-spacing"
- ng-disabled="showRegistrationDiv || showSearchDiv"
+ ng-disabled="showRegistrationDiv"
ng-click="search(searchMode.listAll)">
{{'list_all'| translate}}
</button>
-
- <span class="horizonal-spacing">
- <button type="button"
- class="btn btn-default small-horizonal-spacing"
- ng-click="showRegistration()">
- {{'register'| translate}} {{selectedProgram.trackedEntity.name }}
- </button>
- </span>
</div>
</div>
-
+
<div class="row vertical-spacing">
<div class="col-md-4">
<select class="form-control" ng-model="pr" ng-change="getProgramAttributes(pr)" ng-options="program as program.name for program in programs | orderBy: 'name'">
<option value="">{{'please_select_a_program'| translate}}</option>
</select>
- </div>
+ </div>
+ <div class="col-md-3 trim">
+ <button type="button"
+ class="btn btn-default"
+ ng-click="showRegistration()">
+ {{'register'| translate}} {{selectedProgram.trackedEntity.name}}
+ </button>
+ </div>
</div>
-
+
<div class="row vertical-spacing" ng-if="!searchText && emptySearchText">
<div class="col-md-4">
<div class="alert alert-danger">{{'search_input_required'| translate}}</div>
=== modified file 'dhis-2/dhis-web/dhis-web-tracker-capture/src/main/webapp/dhis-web-tracker-capture/views/pagination.html'
--- dhis-2/dhis-web/dhis-web-tracker-capture/src/main/webapp/dhis-web-tracker-capture/views/pagination.html 2014-03-17 15:59:31 +0000
+++ dhis-2/dhis-web/dhis-web-tracker-capture/src/main/webapp/dhis-web-tracker-capture/views/pagination.html 2014-05-22 13:19:01 +0000
@@ -1,5 +1,5 @@
<div class="paging-container">
- <table style="background-color: #ebf0f6;" width='100%'>
+ <table style="background-color: #f5f5f5;" width='100%'>
<tr>
<td>
{{'total_number_of_pages'| translate}}: {{paginator.pageCount()}}
=== modified file 'dhis-2/dhis-web/dhis-web-tracker-capture/src/main/webapp/dhis-web-tracker-capture/views/search.html'
--- dhis-2/dhis-web/dhis-web-tracker-capture/src/main/webapp/dhis-web-tracker-capture/views/search.html 2014-05-21 15:55:51 +0000
+++ dhis-2/dhis-web/dhis-web-tracker-capture/src/main/webapp/dhis-web-tracker-capture/views/search.html 2014-05-22 13:19:01 +0000
@@ -1,7 +1,7 @@
<div class="bordered-div">
<div class="search-container">
- <table class="dhis2-list-table-striped dhis2-table-hover">
+ <table class="table-borderless table-striped">
<tr>
<td>{{'org_unit_mode'| translate}}</td>
<td>
=== modified file 'dhis-2/dhis-web/dhis-web-tracker-capture/src/main/webapp/dhis-web-tracker-capture/views/trackedEntityList.html'
--- dhis-2/dhis-web/dhis-web-tracker-capture/src/main/webapp/dhis-web-tracker-capture/views/trackedEntityList.html 2014-05-21 15:55:51 +0000
+++ dhis-2/dhis-web/dhis-web-tracker-capture/src/main/webapp/dhis-web-tracker-capture/views/trackedEntityList.html 2014-05-22 13:19:01 +0000
@@ -24,7 +24,7 @@
<!-- entity begins -->
<div class="vertical-spacing">
- <table class="listTable dhis2-table-striped-border dhis2-table-hover">
+ <table class="table table-striped dhis2-table-hover">
<thead>
<tr>
<th ng-show="gridColumn.show" ng-repeat="gridColumn in gridColumns">
