dhis2-devs team mailing list archive
-
dhis2-devs team
-
Mailing list archive
-
Message #28564
[Branch ~dhis2-devs-core/dhis2/trunk] Rev 14274: clean up
------------------------------------------------------------
revno: 14274
committer: Abyot Asalefew Gizaw abyota@xxxxxxxxx
branch nick: dhis2
timestamp: Tue 2014-03-18 11:09:53 +0100
message:
clean up
modified:
dhis-2/dhis-web/dhis-web-event-capture/src/main/webapp/dhis-web-event-capture/event-capture.appcache
dhis-2/dhis-web/dhis-web-event-capture/src/main/webapp/dhis-web-event-capture/index.html
dhis-2/dhis-web/dhis-web-event-capture/src/main/webapp/dhis-web-event-capture/scripts/app.js
dhis-2/dhis-web/dhis-web-event-capture/src/main/webapp/dhis-web-event-capture/scripts/services.js
dhis-2/dhis-web/dhis-web-event-capture/src/main/webapp/dhis-web-event-capture/styles/style.css
dhis-2/dhis-web/dhis-web-tracker-capture/src/main/webapp/dhis-web-tracker-capture/tracker-capture-appcache
dhis-2/dhis-web/pom.xml
--
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-event-capture/src/main/webapp/dhis-web-event-capture/event-capture.appcache'
--- dhis-2/dhis-web/dhis-web-event-capture/src/main/webapp/dhis-web-event-capture/event-capture.appcache 2014-03-10 12:31:22 +0000
+++ dhis-2/dhis-web/dhis-web-event-capture/src/main/webapp/dhis-web-event-capture/event-capture.appcache 2014-03-18 10:09:53 +0000
@@ -1,13 +1,9 @@
CACHE MANIFEST
CACHE:
-lib/jquery/js/jquery-1.8.3.js
-lib/jquery/js/jquery-ui-1.9.2.custom.js
-lib/jquery/css/ui-lightness/jquery-ui-1.9.2.custom.css
-
-../dhis-web-commons/css/light_blue/light_blue.css
-../dhis-web-commons/css/widgets.css
-
+../dhis-web-commons/javascripts/jQuery/jquery.min.js
+../dhis-web-commons/javascripts/jQuery/ui/jquery-ui-1.9.1.custom.min.js
+../dhis-web-commons/javascripts/jQuery/ui/css/redmond/jquery-ui-1.9.1.custom.css
../dhis-web-commons/fonts/LiberationSans-Regular-webfont.eot
../dhis-web-commons/fonts/LiberationSans-Regular-webfont.woff
@@ -25,19 +21,25 @@
../dhis-web-commons/font-awesome/fonts/fontawesome-webfont.woff
../dhis-web-commons/font-awesome/fonts/FontAwesome.otf
-
+../dhis-web-commons/css/light_blue/light_blue.css
+../dhis-web-commons/css/widgets.css
styles/style.css
-lib/bootstrap/js/bootstrap.min.js
-
-lib/angular/angular.js
-lib/angular/angular-resource.js
-lib/angular/angular-route.js
-lib/angular/angular-cookies.js
-lib/angular/angular-animate.js
-lib/angular/ui-bootstrap-tpls-0.10.0.js
-
-lib/moment/moment-with-langs.min.js
+../dhis-web-commons/bootstrap/js/bootstrap.min.js
+
+../dhis-web-commons/javascripts/angular/angular.js
+../dhis-web-commons/javascripts/angular/angular-resource.js
+../dhis-web-commons/javascripts/angular/angular-route.js
+../dhis-web-commons/javascripts/angular/angular-cookies.js
+../dhis-web-commons/javascripts/angular/angular-animate.js
+../dhis-web-commons/javascripts/angular/ui-bootstrap-tpls-0.10.0.js
+
+../dhis-web-commons/javascripts/angular/plugins/angularLocalStorage.js
+../dhis-web-commons/javascripts/angular/plugins/angular-translate.min.js
+../dhis-web-commons/javascripts/angular/plugins/angular-translate-loader-static-files.min.js
+../dhis-web-commons/javascripts/angular/plugins/angular-translate-loader-url.min.js
+
+../dhis-web-commons/javascripts/moment/moment-with-langs.min.js
../dhis-web-commons/css/light_blue/logo_banner.png
../images/ajax-loader-bar.gif
@@ -72,18 +74,12 @@
../dhis-web-commons/ouwt/ouwt.js
scripts/event-capture.js
-scripts/angularLocalStorage.js
-scripts/angular-translate.min.js
-scripts/angular-translate-loader-static-files.min.js
-scripts/angular-translate-loader-url.min.js
-
scripts/app.js
scripts/services.js
scripts/directives.js
scripts/controllers.js
scripts/filters.js
-
views/pagination.html
views/modal.html
views/dialog.html
=== modified file 'dhis-2/dhis-web/dhis-web-event-capture/src/main/webapp/dhis-web-event-capture/index.html'
--- dhis-2/dhis-web/dhis-web-event-capture/src/main/webapp/dhis-web-event-capture/index.html 2014-03-09 14:44:43 +0000
+++ dhis-2/dhis-web/dhis-web-event-capture/src/main/webapp/dhis-web-event-capture/index.html 2014-03-18 10:09:53 +0000
@@ -7,22 +7,20 @@
<meta name="keywords" content="DHIS 2">
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
- <script type="text/javascript" src="lib/jquery/js/jquery-1.8.3.js"></script>
- <script type="text/javascript" src="lib/jquery/js/jquery-ui-1.9.2.custom.js"></script>
- <link rel="stylesheet" type="text/css" href="lib/jquery/css/ui-lightness/jquery-ui-1.9.2.custom.css">
-
- <script type="text/javascript" src="lib/bootstrap/js/bootstrap.min.js"></script>
- <!--<link rel="stylesheet" type="text/css" href="lib/bootstrap/css/bootstrap-theme.min.css">
- <link rel="stylesheet" type="text/css" href="lib/bootstrap/css/bootstrap.min.css">-->
-
- <script type="text/javascript" src="lib/angular/angular.js"></script>
- <script type="text/javascript" src="lib/angular/angular-resource.js"></script>
- <script type="text/javascript" src="lib/angular/angular-route.js"></script>
- <script type="text/javascript" src="lib/angular/angular-cookies.js"></script>
- <script type="text/javascript" src="lib/angular/angular-animate.js"></script>
- <script type="text/javascript" src="lib/angular/ui-bootstrap-tpls-0.10.0.js"></script>
-
- <script type="text/javascript" src="lib/moment/moment-with-langs.min.js"></script>
+ <script type="text/javascript" src="../dhis-web-commons/javascripts/jQuery/jquery.min.js"></script>
+ <script type="text/javascript" src="../dhis-web-commons/javascripts/jQuery/ui/jquery-ui-1.9.1.custom.min.js"></script>
+ <link rel="stylesheet" type="text/css" href="../dhis-web-commons/javascripts/jQuery/ui/css/redmond/jquery-ui-1.9.1.custom.css">
+
+ <script type="text/javascript" src="../dhis-web-commons/bootstrap/js/bootstrap.min.js"></script>
+
+ <script type="text/javascript" src="../dhis-web-commons/javascripts/angular/angular.js"></script>
+ <script type="text/javascript" src="../dhis-web-commons/javascripts/angular/angular-resource.js"></script>
+ <script type="text/javascript" src="../dhis-web-commons/javascripts/angular/angular-route.js"></script>
+ <script type="text/javascript" src="../dhis-web-commons/javascripts/angular/angular-cookies.js"></script>
+ <script type="text/javascript" src="../dhis-web-commons/javascripts/angular/angular-animate.js"></script>
+ <script type="text/javascript" src="../dhis-web-commons/javascripts/angular/ui-bootstrap-tpls-0.10.0.js"></script>
+
+ <script type="text/javascript" src="../dhis-web-commons/javascripts/moment/moment-with-langs.min.js"></script>
<script type="text/javascript" src="../dhis-web-commons/javascripts/underscore.min.js"></script>
<script type="text/javascript" src="../dhis-web-commons/javascripts/dhis2/dhis2.util.js"></script>
@@ -49,12 +47,12 @@
<script type="text/javascript" src="../dhis-web-commons/javascripts/dhis2/dhis2.appcache.js"></script>
<script type="text/javascript" src="../dhis-web-commons/ouwt/ouwt.js"></script>
- <script type="text/javascript" src="scripts/event-capture.js"></script>
- <script type="text/javascript" src="scripts/angularLocalStorage.js"></script>
- <script type="text/javascript" src="scripts/angular-translate.min.js"></script>
- <script type="text/javascript" src="scripts/angular-translate-loader-static-files.min.js"></script>
- <script type="text/javascript" src="scripts/angular-translate-loader-url.min.js"></script>
+ <script type="text/javascript" src="../dhis-web-commons/javascripts/angular/plugins/angularLocalStorage.js"></script>
+ <script type="text/javascript" src="../dhis-web-commons/javascripts/angular/plugins/angular-translate.min.js"></script>
+ <script type="text/javascript" src="../dhis-web-commons/javascripts/angular/plugins/angular-translate-loader-static-files.min.js"></script>
+ <script type="text/javascript" src="../dhis-web-commons/javascripts/angular/plugins/angular-translate-loader-url.min.js"></script>
+ <script type="text/javascript" src="scripts/event-capture.js"></script>
<script type="text/javascript" src="scripts/app.js"></script>
<script type="text/javascript" src="scripts/services.js"></script>
<script type="text/javascript" src="scripts/directives.js"></script>
@@ -329,7 +327,7 @@
<h2>
{{'update_event'| translate}}
</h2>
- <div style="width:50%;">
+ <div class="bordered-div" style="width:50%;">
<form name="outerForm" novalidate>
<table class="dhis2-list-table-striped">
<thead>
@@ -411,9 +409,9 @@
<!-- event registration begins -->
<div ng-show="eventRegistration">
<h2>
- {{'new_event_registration'| translate}}
+ {{'new_event'| translate}}
</h2>
- <div style="width:50%;">
+ <div class="bordered-div" style="width:50%;">
<form name="outerForm" novalidate>
<table class="dhis2-list-table-striped">
<tbody id="list">
@@ -434,6 +432,7 @@
</tr>
</tbody>
</table>
+ <hr>
<table class="dhis2-list-table-striped">
<thead>
<tr>
@@ -509,7 +508,7 @@
</form>
</div>
</div>
- <!-- event registration ends -->
+ <!-- event registration ends -->
</div>
</div>
=== modified file 'dhis-2/dhis-web/dhis-web-event-capture/src/main/webapp/dhis-web-event-capture/scripts/app.js'
--- dhis-2/dhis-web/dhis-web-event-capture/src/main/webapp/dhis-web-event-capture/scripts/app.js 2014-03-07 08:37:37 +0000
+++ dhis-2/dhis-web/dhis-web-event-capture/src/main/webapp/dhis-web-event-capture/scripts/app.js 2014-03-18 10:09:53 +0000
@@ -15,15 +15,7 @@
.value('DHIS2URL', '../..')
-.config(function($routeProvider, $httpProvider, $translateProvider) {
-
-
- $routeProvider.when('/',{
- templateUrl:'index.html',
- controller: 'MainController'
- }).otherwise({
- redirectTo : '/'
- });
+.config(function($httpProvider, $translateProvider) {
$httpProvider.defaults.useXDomain = true;
delete $httpProvider.defaults.headers.common['X-Requested-With'];
=== modified file 'dhis-2/dhis-web/dhis-web-event-capture/src/main/webapp/dhis-web-event-capture/scripts/services.js'
--- dhis-2/dhis-web/dhis-web-event-capture/src/main/webapp/dhis-web-event-capture/scripts/services.js 2014-03-07 17:20:21 +0000
+++ dhis-2/dhis-web/dhis-web-event-capture/src/main/webapp/dhis-web-event-capture/scripts/services.js 2014-03-18 10:09:53 +0000
@@ -5,7 +5,7 @@
var eventCaptureServices = angular.module('eventCaptureServices', ['ngResource'])
/* Factory to fetch programs */
-.factory('ProgramFactory', function($http, DHIS2URL) {
+.factory('ProgramFactory', function($http) {
var programUid, programPromise;
var programs, programsPromise;
@@ -14,7 +14,7 @@
get: function(uid){
if( programUid !== uid ){
- programPromise = $http.get(DHIS2URL + '/api/programs/' + uid + '.json?viewClass=detailed&paging=false').then(function(response){
+ programPromise = $http.get('../api/programs/' + uid + '.json?viewClass=detailed&paging=false').then(function(response){
programUid = response.data.id;
program = response.data;
return program;
@@ -25,7 +25,7 @@
getMine: function(type){
if( !programsPromise ){
- programsPromise = $http.get(DHIS2URL + '/api/me/programs?includeDescendants=true&type='+type).then(function(response){
+ programsPromise = $http.get('../api/me/programs?includeDescendants=true&type='+type).then(function(response){
programs = response.data;
return programs;
});
@@ -35,7 +35,7 @@
getEventProgramsByOrgUnit: function(orgUnit, type){
- var promise = $http.get( DHIS2URL + '/api/programs.json?orgUnit=' + orgUnit + '&type=' + type ).then(function(response){
+ var promise = $http.get( '../api/programs.json?orgUnit=' + orgUnit + '&type=' + type ).then(function(response){
programs = response.data;
return programs;
});
@@ -45,13 +45,13 @@
})
/* Factory to fetch programStages */
-.factory('ProgramStageFactory', function($http, DHIS2URL, storage) {
+.factory('ProgramStageFactory', function($http, storage) {
var programStage, promise;
return {
get: function(uid){
if( programStage !== uid ){
- promise = $http.get( DHIS2URL + '/api/programStages/' + uid + '.json?viewClass=detailed&paging=false').then(function(response){
+ promise = $http.get( '../api/programStages/' + uid + '.json?viewClass=detailed&paging=false').then(function(response){
programStage = response.data.id;
//store locally - might need them for event data values
@@ -68,13 +68,13 @@
})
/* factory for loading logged in user profiles from DHIS2 */
-.factory('CurrentUserProfile', function($http, DHIS2URL) {
+.factory('CurrentUserProfile', function($http) {
var profile, promise;
return {
get: function() {
if( !promise ){
- promise = $http.get(DHIS2URL + '/api/me/profile').then(function(response){
+ promise = $http.get('../api/me/profile').then(function(response){
profile = response.data;
return profile;
});
@@ -85,19 +85,20 @@
})
/* factory for handling events */
-.factory('DHIS2EventFactory', function($http, DHIS2URL) {
+.factory('DHIS2EventFactory', function($http) {
return {
getByPerson: function(person, orgUnit, program){
- var promise = $http.get(DHIS2URL + '/api/events.json?' + 'person=' + person + '&orgUnit=' + orgUnit + '&program=' + program + '&paging=false').then(function(response){
+ var promise = $http.get('../api/events.json?' + 'person=' + person + '&orgUnit=' + orgUnit + '&program=' + program + '&paging=false').then(function(response){
return response.data.eventList;
});
return promise;
},
getByStage: function(orgUnit, programStage){
- var promise = $http.get(DHIS2URL + '/api/events.json?' + 'orgUnit=' + orgUnit + '&programStage=' + programStage + '&paging=false')
+ var promise = $http.get('../api/events.json?' + 'orgUnit=' + orgUnit + '&programStage=' + programStage + '&paging=false')
+ //var promise = $http.get('../api/events.json?' + 'orgUnit=' + orgUnit + '&programStage=' + programStage )
.then(function(response){
return response.data.eventList;
@@ -111,9 +112,8 @@
return promise;
},
- get: function(eventUid){
-
- var promise = $http.get(DHIS2URL + '/api/events/' + eventUid + '.json').then(function(response){
+ get: function(eventUid){
+ var promise = $http.get('../api/events/' + eventUid + '.json').then(function(response){
return response.data;
}, function(){
@@ -122,12 +122,11 @@
return promise;
},
- create: function(dhis2Event){
-
+ create: function(dhis2Event){
var e = angular.copy(dhis2Event);
dhis2.ec.storageManager.saveEvent(e);
- var promise = $http.post(DHIS2URL + '/api/events.json', dhis2Event).then(function(response){
+ var promise = $http.post('../api/events.json', dhis2Event).then(function(response){
dhis2.ec.storageManager.clearEvent(e);
return response.data;
}, function(){
@@ -138,7 +137,7 @@
delete: function(dhis2Event){
dhis2.ec.storageManager.clearEvent(dhis2Event);
- var promise = $http.delete(DHIS2URL + '/api/events/' + dhis2Event.event).then(function(response){
+ var promise = $http.delete('../api/events/' + dhis2Event.event).then(function(response){
return response.data;
}, function(){
});
@@ -147,18 +146,16 @@
update: function(dhis2Event){
dhis2.ec.storageManager.saveEvent(dhis2Event);
- var promise = $http.put(DHIS2URL + '/api/events/' + dhis2Event.event, dhis2Event).then(function(response){
+ var promise = $http.put('../api/events/' + dhis2Event.event, dhis2Event).then(function(response){
dhis2.ec.storageManager.clearEvent(dhis2Event);
return response.data;
});
return promise;
},
- updateForSingleValue: function(singleValue, fullValue){
-
+ updateForSingleValue: function(singleValue, fullValue){
dhis2.ec.storageManager.saveEvent(fullValue);
-
- var promise = $http.put(DHIS2URL + '/api/events/' + singleValue.event + '/' + singleValue.dataValues[0].dataElement, singleValue ).then(function(response){
+ var promise = $http.put('../api/events/' + singleValue.event + '/' + singleValue.dataValues[0].dataElement, singleValue ).then(function(response){
dhis2.ec.storageManager.clearEvent(fullValue);
return response.data;
}, function(){
=== modified file 'dhis-2/dhis-web/dhis-web-event-capture/src/main/webapp/dhis-web-event-capture/styles/style.css'
--- dhis-2/dhis-web/dhis-web-event-capture/src/main/webapp/dhis-web-event-capture/styles/style.css 2014-03-05 11:07:39 +0000
+++ dhis-2/dhis-web/dhis-web-event-capture/src/main/webapp/dhis-web-event-capture/styles/style.css 2014-03-18 10:09:53 +0000
@@ -2,38 +2,6 @@
/* Form
/*----------------------------------------------------------------------------*/
-input[type="button"], input[type="submit"]
-{
- width: 130px;
-}
-
-input.tiny-button[type="button"]
-{
- width: 20px;
- height: 20px;
-}
-
-input.small-button[type="button"]
-{
- width: 30px;
- height: 30px;
-}
-
-input.normal-button[type="button"] , input.normal-button[type="submit"]
-{
- width: 60px;
-}
-
-input.large-button[type="button"]
-{
- width: 130px;
-}
-
-select.search-field
-{
- width: 180px;
-}
-
input[type="text"]
{
width: 260px;
@@ -49,31 +17,6 @@
width: 264px;
}
-textarea
-{
- width: 264px;
-}
-
-.button-list
-{
- text-align:right;
- padding-bottom:10px;
- width:100%;
-}
-
-.incomplete-record
-{
- color: black;
- font-size: 21px;
- font-weight: bold;
-}
-
-.img-button
-{
- width:20px;
- cursor:pointer;
-}
-
/*----------------------------------------------------------------------------*/
/* Table
/*----------------------------------------------------------------------------*/
@@ -85,491 +28,9 @@
margin-bottom: 10px;
}
-.heading-column
-{
- width: 400px;
-}
-
-td.input-column
-{
- padding-left: 5px;
- padding-right: 1px;
-}
-
-td.error {
- padding-left: 1em;
-}
-
-table.information, td.information
-{
- border:1px solid #808080;
- vertical-align:top;
- padding:10px;
-}
-
-.text-column
-{
- padding-left: 5px;
- padding-right: 6px;
- text-align: left;
-}
-
-.errorCell
-{
- background-color: #FFCFCF
-}
-
-.advanced-search
-{
- position: relative;
- border: 1px solid #a4d2a3;
- background-color: #d5efd5;
- padding-top: 10px;
- padding-right: 20px;
- padding-bottom: 5px;
- padding-left: 20px;
- margin-bottom: 15px;
- border-radius: 3px;
- max-width: 570px;
-}
-
-#minimized-advanced-search
-{
- position: relative;
- border: 1px solid #a4d2a3;
- background-color: #d5efd5;
- padding-top: 10px;
- padding-right: 20px;
- padding-bottom: 5px;
- padding-left: 20px;
- margin-bottom: 15px;
- border-radius: 3px;
-}
-
-.green-background
-{
- position: relative;
- border: 1px solid #a4d2a3;
- background-color: #d5efd5;
- padding-top: 10px;
- padding-right: 20px;
- padding-bottom: 5px;
- padding-left: 20px;
- margin-bottom: 15px;
- border-radius: 3px;
-}
-
-.searchInput
-{
- width: 240px;
-}
-
-/*----------------------------------------------------------------------------*/
-/* Button list
-/*----------------------------------------------------------------------------*/
-
-.buttons
-{
- text-align:right;
- padding-bottom:10px;
- width:100%;
-}
-
-div.actions
-{
- float: right;
- width: 140px;
- text-align: right;
-}
-
-/*----------------------------------------------------------------------------*/
-/* Data entry form */
-/*----------------------------------------------------------------------------*/
-
-.entryScreen
-{
- margin-bottom: 20px;
- width: 100%;
- font-size: 13px;
- line-height: 18px;
-}
-
-input.criteria
-{
- width: 130px;
- margin-right: 5px;
-}
-
-input.move-button
-{
- width: 20px;
- height: 60px;
- border-color: #bbbbbb;
- cursor: pointer;
- border: 1px solid #aaa;
- margin: 0px;
-}
-
-input.optionset[type="text"]
-{
- width:240px;
-}
-
-input.datefield[type="text"]
-{
- width:240px;
-}
-
-div.provided-elsewhere
-{
- width:20px;
- height:20px;
-}
-
-.ui-button
-{
- max-height: 100px;
-}
-
-.ui-autocomplete
-{
- max-height: 100px;
- overflow-y: auto;
- overflow-x: hidden;
-}
-
-.hidden
-{
- display: none;
-}
-
-.colorHelpTable td
-{
- height: 32px;
-}
-
-/* --------------------------------------------------------------
-// Dashboard
-// -------------------------------------------------------------- */
-
-div.dashboard-area
-{
- list-style: none inside;
- margin: 50px 50px;
- margin: 0;
- padding: 0;
-}
-
-p.header
-{
- background-color:#CBDDEB;
- background-repeat:repeat-x;
- border:1px solid #C8DBEA;
- color:#39547D;
- padding:6px;
- margin:0px;
- font-family: LiberationSansBold,arial;
-}
-
-table.link-area
-{
- border:1px solid #d0d0d0;
- padding-top:1px;
- padding-right:1px;
- padding-left:1px;
- padding-bottom:0px;
- height:120px;
- overflow:hidden;
- align:bottom;
-}
-
-div.link-area
-{
- display:inline-block;
- border:1px solid #d0d0d0;
- padding-top:1px;
- padding-right:1px;
- padding-left:1px;
- padding-bottom:0px;
- height:172px;
-
- overflow:hidden;
-}
-
-.contentProviderTable
-{
- height: 140px;
- overflow-y: auto;
- overflow-x:hidden;
-}
-
-.contentProviderTable table
-{
- width:100%;
-}
-
-.contentProviderTable td
-{
- padding-top:3px;
- padding-bottom:3px;
- border-bottom:1px solid #cad5e5;
-}
-
-div.event-dashboard
-{
- width:900px;
- border:1px solid #d0d0d0;
- position:relative;
- top: 47px;
-}
-
-div.link-area-active
-{
- width:900px;
- border:10px solid #d0d0d0;
- position:relative;
- top: 47px;
-}
-
-div.event-flow-dashboard
-{
- width:900px;
- height:140px;
- overflow-x:auto;
- overflow-y:hidden;
-}
-
-#subMenu
-{
- position:absolute;
-}
-
-#subMenu ul
-{
- list-style-type:none;
- margin: 0;
-}
-
-#subMenu li
-{
- float:left;
-}
-
-#subMenu a
-{
- padding: 6px 12px;
- height: 25px;
- border: 1px solid #aaa;
- border-radius: 3px;
- margin-right: 4px;
- font-family: LiberationSansBold, arial;
- font-size: 13px;
- color: #606060;
- background-color: #f3f3f3;
-}
-
-#subMenu a:hover
-{
- text-decoration: none;
- background-color: #f8f8f8;
-}
-
-.tooltip
-{
- border-bottom: dashed 1px #aaa;
- text-decoration: none;
- cursor: help;
- text-align: left;
-}
-
-.tooltip-target {
- width: 250px;
- top: 29px;
- left: 764px;
- display: none;
- padding: 10px;
- background: #ffffff;
- position: absolute;
- display: none;
- float: left;
- -webkit-border-radius: 7px;
- -moz-border-radius: 7px;
- border-radius: 7px;
- border: solid 1px #ddd;
- z-index:1001;
-}
-
-.comment-table
-{
- width:320px;
- overflow-y: auto;
- overflow-x:hidden;
-}
-
-.comment-table td
-{
- padding-top:3px;
- padding-bottom:3px;
- border-bottom:1px solid #cad5e5;
-}
-
-/* --------------------------------------------------------------
-// program-stage-instances
-// -------------------------------------------------------------- */
-
-.stage-container
-{
- width:100%;
- height:100px;
-}
-
-.stage-flow
-{
- height:100px;
- overflow-x:hidden;
- overflow-y:hidden;
-}
-
-.table-flow
-{
- height:100px;
- overflow-x:hidden;
- overflow-y:hidden;
-}
-
-.arrow-left {
- width:0;
- height:0;
- border-top:45px solid transparent;
- border-bottom:45px solid transparent;
- border-right:30px solid #d0d0d0;
- cursor:pointer;
-}
-
-.arrow-right {
- width:0;
- height:0;
- border-top:45px solid transparent;
- border-bottom:45px solid transparent;
- border-left:30px solid #d0d0d0;
- cursor:pointer;
-}
-
-div.orgunit-object
-{
- margin-left: 5px;
- width: 120px;
-}
-
-input.stage-object[type="button"]
-{
- width: 135px;
- height: 60px;
- cursor: pointer;
- opacity: 1.0;
- border: 2px solid;
- margin: 5px;
- white-space: normal;
-}
-
-input.stage-object[type="button"]:hover
-{
- border: 5px solid;
-}
-
-input.stage-object-selected[type="button"]
-{
- border: 5px solid;
-}
-
-input.stage-scheduled[type="button"]
-{
- border: 5px solid;
-}
-
-input.patient-object[type="button"]
-{
- width: 130px;
- height: 60px;
- border-color: #bbbbbb;
- background-color: #ddd;
- cursor: pointer;
- border: 1px solid #aaa;
- margin: 5px;
- border-radius: 2px;
-}
-
-div.dashboard-history
-{
- z-index:100;
- width:300px;
- height:200px;
- position:absolute;
- left:650px;
- top:115px;
- background-color:#ffffff;
- border:1px solid #d0d0d0;
- padding-top:1px;
- padding-right:1px;
- padding-left:1px;
- padding-bottom:1px;
-}
-
-/*----------------------------------------------------------------------------*/
-/* Program tracking
-/*----------------------------------------------------------------------------*/
-
-div.link-area-tracking
-{
- display:inline-block;
- border:1px solid #d0d0d0;
- padding-top:1px;
- padding-right:1px;
- padding-left:1px;
- padding-bottom:0px;
- height:200px;
- width:60%;
- overflow:hidden;
-}
-
-.gridTable th, .gridTable td {
- line-height: 200%;
-}
-
-/* Treepanel contextmenu */
-#treepanel-contextmenu {
- border-radius: 2px;
- border-width: 1px;
- border-style: solid;
- border-color: #aaa;
-}
-
-
-/* --------------------------------------------------------------
-// Capture Coordinates
-// -------------------------------------------------------------- */
-
-.coordinates1{
- width: 110px;
- white-space: normal;
-}
-
-.coordinates2{
- width: 150px;
-}
-
-
-.commentHeader
-{
- color: #606060;
- font-size: 17px;
- padding: 5px 0;
-}
-
-
-/* --------------------------------------------------------------
-// App - specific (might change this if Lars is not happy
-// -------------------------------------------------------------- */
+// --------------------------------------------------------------
+// App specific
+// --------------------------------------------------------------
.container-heading {
color: white;
@@ -596,95 +57,6 @@
margin-top: 1em;
}
-.org-unit-tree {
- font-size: 10pt;
- margin-top: 20px;
- padding-top: 4px;
- background-color: white;
- overflow: auto;
- width: 100%;
- height: 400px;
- border-top: 1px solid #e3e3e3;
- border-bottom: 1px solid #e3e3e3;
-}
-
-ul.tree, ul.tree ul {
- list-style:none;
- margin:0;
- padding:0;
-}
-
-ul.tree ul {
- margin-left:6px; /* indentation */
- position:relative;
-}
-
-ul.tree ul:before {
- content:"";
- display:block;
- width:0;
- position:absolute;
- top:0;
- bottom:0;
- left:0;
- border-left:1px solid grey;
-}
-
-ul.tree li {
- margin:0;
- padding:0 10px; /* indentation + 2 */
- line-height:20px; /* default list item `line-height` */
- position:relative;
-}
-
-ul.tree ul li:before {
- content:"";
- display:block;
- width:10px; /* same with indentation */
- height:0;
- border-top:1px solid grey;
- position:absolute;
- top:8px;
- left:0;
-}
-
-ul.tree ul li:last-child:before {
- background:white; /* same with body background */
- height:auto;
- top:8px; /* (line-height/2) */
- bottom:0;
-}
-
-.tree-node {
- background:transparent;
- border:none;
- outline:none;
- cursor:pointer;
- color: #5C0000;
-}
-
-.tree-node:hover
-{
- color: #555;
- background-color: #fff;
-}
-
-.tree-expand-collapse {
- background:transparent;
- border:none;
- outline:none;
- cursor:pointer;
-}
-
-.selected-org-unit {
- font-weight: bold;
- color: #000;
-}
-
-/*a {
- margin-left: 5px;
-}*/
-
div.paging a.active
{
text-decoration: none;
@@ -734,13 +106,14 @@
.bordered-div
{
border: 1px solid #c2c2c2;
- border-radius: 10px;
+ border-radius: 5px;
padding: 5px 10px;
margin-bottom: 20px;
}
-
-.nav, .pagination, .carousel, .panel-title a { cursor: pointer; }
+.nav, .pagination, .carousel, .panel-title a {
+ cursor: pointer;
+}
input[type=number]::-webkit-inner-spin-button, input[type=number]::-webkit-outer-spin-button {
-webkit-appearance: none;
@@ -763,8 +136,7 @@
.table-borderless>thead>tr>td,
.table-borderless>tbody>tr>td,
.table-borderless>tfoot>tr>td {
- border-top: none;
- //background-color: #ebf0f6;
+ border-top: none;
}
.dhis2-table>thead>tr>th,
@@ -795,8 +167,7 @@
.dhis2-table-striped>thead>tr,
.dhis2-table-striped>tbody>tr,
.dhis2-table-striped>tfoot>tr {
- border-bottom: 1px solid #cad5e5;
- //border: none;
+ border-bottom: 1px solid #cad5e5;
}
.dhis2-table-striped > tbody > tr:nth-child(odd)> td, .dhis2-table-striped > tbody > tr:nth-child(odd)> th {
@@ -805,7 +176,6 @@
.dhis2-list-table-striped {
width: 100%;
- border: 1px solid #c2c2c2;
padding: 5px 10px;
}
=== modified file 'dhis-2/dhis-web/dhis-web-tracker-capture/src/main/webapp/dhis-web-tracker-capture/tracker-capture-appcache'
--- dhis-2/dhis-web/dhis-web-tracker-capture/src/main/webapp/dhis-web-tracker-capture/tracker-capture-appcache 2014-03-17 15:59:31 +0000
+++ dhis-2/dhis-web/dhis-web-tracker-capture/src/main/webapp/dhis-web-tracker-capture/tracker-capture-appcache 2014-03-18 10:09:53 +0000
@@ -1,9 +1,9 @@
CACHE MANIFEST
CACHE:
-../dhis-web-commons/javascripts/jquery/js/jquery-1.8.3.js
-../dhis-web-commons/javascripts/jquery/js/jquery-ui-1.9.2.custom.js
-../dhis-web-commons/javascripts/jquery/css/ui-lightness/jquery-ui-1.9.2.custom.css
+../dhis-web-commons/javascripts/jQuery/jquery.min.js
+../dhis-web-commons/javascripts/jQuery/ui/jquery-ui-1.9.1.custom.min.js
+../dhis-web-commons/javascripts/jQuery/ui/css/redmond/jquery-ui-1.9.1.custom.css
../dhis-web-commons/fonts/LiberationSans-Regular-webfont.eot
../dhis-web-commons/fonts/LiberationSans-Regular-webfont.woff
@@ -25,7 +25,7 @@
../dhis-web-commons/css/widgets.css
styles/style.css
-../dhis-web-commons/javascripts/bootstrap/js/bootstrap.min.js
+../dhis-web-commons/bootstrap/js/bootstrap.min.js
../dhis-web-commons/javascripts/angular/angular.js
../dhis-web-commons/javascripts/angular/angular-resource.js
@@ -73,7 +73,7 @@
../dhis-web-commons/javascripts/dhis2/dhis2.appcache.js
../dhis-web-commons/ouwt/ouwt.js
-scripts/event-capture.js
+scripts/tracker-capture.js
scripts/app.js
scripts/services.js
scripts/directives.js
=== modified file 'dhis-2/dhis-web/pom.xml'
--- dhis-2/dhis-web/pom.xml 2014-03-17 15:59:31 +0000
+++ dhis-2/dhis-web/pom.xml 2014-03-18 10:09:53 +0000
@@ -24,11 +24,11 @@
<module>dhis-web-reporting</module>
<module>dhis-web-mapping</module>
<module>dhis-web-visualizer</module>
- <module>dhis-web-pivot</module>
+ <module>dhis-web-pivot</module>
+ <module>dhis-web-dashboard-integration</module>
<module>dhis-web-event-capture</module>
<module>dhis-web-event-reports</module>
<module>dhis-web-tracker-capture</module>
- <module>dhis-web-dashboard-integration</module>
<module>dhis-web-caseentry</module>
<module>dhis-web-light</module>
<module>dhis-web-mobile</module>
