dhis2-devs team mailing list archive
-
dhis2-devs team
-
Mailing list archive
-
Message #40104
[Branch ~dhis2-devs-core/dhis2/trunk] Rev 20303: browser-cache-cleaner: cleanup
------------------------------------------------------------
revno: 20303
committer: Abyot Asalefew Gizaw <abyota@xxxxxxxxx>
branch nick: dhis2
timestamp: Wed 2015-09-23 09:59:37 +0200
message:
browser-cache-cleaner: cleanup
modified:
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-cache-cleaner/index.html
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-cache-cleaner/styles/style.css
--
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-apps/src/main/webapp/dhis-web-cache-cleaner/index.html'
--- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-cache-cleaner/index.html 2015-08-06 09:49:49 +0000
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-cache-cleaner/index.html 2015-09-23 07:59:37 +0000
@@ -49,22 +49,21 @@
</head>
<body>
- <d2-header-bar></d2-header-bar>
-
- <div id="leftBar"></div>
- <div class="page" id="mainPage" ng-controller="MainController">
-
- <!-- top bar begins -->
- <div class="row top-bar">
- <div class="col-sm-12">
- {{'clearing_dhis2_browser_cache'| translate}}
- </div>
- </div>
- <!-- top bar ends -->
-
-
- <div class="row col-sm-6" ng-if="ssCacheExists || lsCacheExists || idCacheExists">
- <h3 ng-if="ssCacheExists">{{'session_storage'| translate}}</h3>
+ <d2-header-bar></d2-header-bar>
+
+ <div id="leftBar"></div>
+ <div class="page" id="mainPage" ng-controller="MainController">
+
+ <!-- top bar begins -->
+ <div class="row top-bar">
+ <div class="col-sm-12">
+ {{'clearing_dhis2_browser_cache'| translate}}
+ </div>
+ </div>
+ <!-- top bar ends -->
+
+ <div class="row" ng-if="ssCacheExists || lsCacheExists || idCacheExists">
+ <div class="col-sm-6"><h3 ng-if="ssCacheExists">{{'session_storage'| translate}}</h3>
<table class="table table-bordered table-striped" ng-if="ssCacheExists">
<tr ng-repeat="ssKey in ssKeys">
<td>
@@ -75,7 +74,7 @@
</td>
</tr>
</table>
-
+
<h3 ng-if="lsCacheExists">{{'local_storage'| translate}}</h3>
<table class="table table-bordered table-striped" ng-if="lsCacheExists">
<tr ng-repeat="lsKey in lsKeys">
@@ -99,17 +98,20 @@
</td>
</tr>
</table>
-
+
<!--<span class="alert alert-warning">{{'clears_local_cache'| translate}}</span>-->
<a href ng-click="clearCache()" class="btn btn-danger">{{'clear'| translate}}</a>
- <a href ng-click="selectAll()" class="btn btn-primary">{{ (ssKeys | filter: {remove: true}).length > 0 || (lsKeys | filter: {remove: true}).length > 0 || (dbKeys | filter: {remove: true}).length > 0 ? 'unselect_all' : 'select_all' | translate}}</a>
- </div>
-
- <div class="row col-sm-6" ng-if="!lsCacheExists && !idCacheExists">
- <div class="alert alert-info">{{ afterClearing ? 'cache_cleared' : 'nothing_to_clear' | translate}}</div>
- </div>
-
- </div>
-
- </body>
+ <a href ng-click="selectAll()" class="btn btn-primary">{{ (ssKeys | filter: {remove: true}).length > 0 || (lsKeys | filter: {remove: true}).length > 0 || (dbKeys | filter: {remove: true}).length > 0 ? 'unselect_all' : 'select_all' | translate}}</a>
+
+ </div>
+
+ </div>
+
+ <div class="row col-sm-6" ng-if="!lsCacheExists && !idCacheExists">
+ <div class="alert alert-info">{{ afterClearing ? 'cache_cleared' : 'nothing_to_clear' | translate}}</div>
+ </div>
+
+ </div>
+
+</body>
</html>
=== modified file 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-cache-cleaner/styles/style.css'
--- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-cache-cleaner/styles/style.css 2014-12-15 14:00:36 +0000
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-cache-cleaner/styles/style.css 2015-09-23 07:59:37 +0000
@@ -1,6 +1,12 @@
-/*----------------------------------------------------------------------------*/
-/* Table
-/*----------------------------------------------------------------------------*/
+.top-bar {
+ font-size: 16pt;
+ font-weight: normal;
+ color: #585D61;
+}
+
+.vertical-spacing{
+ margin-top: 20px;
+}
table
{
@@ -8,150 +14,4 @@
line-height: 24px;
table-layout: fixed;
margin-bottom: 10px;
-}
-
-/*----------------------------------------------------------------------------*/
-/* App specific
-/*----------------------------------------------------------------------------*/
-
-.container-heading {
- color: white;
-}
-
-.container-default-form {
- width: 50%;
-}
-
-.container-1-1 {
- width: 100%;
- float: left;
- margin-top: 150px;
- margin-left: 150px;
- height: 100%;
- min-height: 100%;
-}
-
-.right {
- float: right !important;
- padding-bottom: 20px;
- margin-bottom: 20px;
-}
-
-.black {
- color: black;
-}
-
-.bold {
- font-weight: bold;
-}
-
-.white {
- color: white;
-}
-
-.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;
- margin: 0;
-}
-
-input[type=date]::-webkit-inner-spin-button, input[type=date]::-webkit-outer-spin-button {
- -webkit-appearance: none;
- margin: 0;
-}
-
-.max-column-width {
- max-width:200px !important;
- word-wrap:break-word;
-}
-
-.table-borderless>thead>tr>th,
-.table-borderless>tbody>tr>th,
-.table-borderless>tfoot>tr>th,
-.table-borderless>thead>tr>td,
-.table-borderless>tbody>tr>td,
-.table-borderless>tfoot>tr>td {
- border-top: none;
- white-space:nowrap;
-}
-
-.dhis2-table>thead>tr>th,
-.dhis2-table>tbody>tr>th,
-.dhis2-table>tfoot>tr>th,
-.dhis2-table>thead>tr>td,
-.dhis2-table>tbody>tr>td,
-.dhis2-table>tfoot>tr>td {
- border-top: none;
- background-color: #ebf0f6;
-}
-
-.dhis2-table-striped-border tr th {
- border: 1px solid #cad5e5;
-}
-
-.dhis2-table-striped-border tr td {
- border: 1px solid #cad5e5;
-}
-
-.dhis2-table-striped-border > tbody > tr:nth-child(odd)> td, .dhis2-table-striped > tbody > tr:nth-child(odd)> th {
- background-color: #ebf0f6
-}
-
-.listTable th {
- height: 30px;
-}
-
-.dhis2-table-striped>thead>tr,
-.dhis2-table-striped>tbody>tr,
-.dhis2-table-striped>tfoot>tr,
-.dhis2-table-striped>thead>tr,
-.dhis2-table-striped>tbody>tr,
-.dhis2-table-striped>tfoot>tr {
- border-bottom: 1px solid #cad5e5;
- white-space:nowrap;
-}
-
-.dhis2-table-striped > tbody > tr:nth-child(odd)> td, .dhis2-table-striped > tbody > tr:nth-child(odd)> th {
- background-color: #ebf0f6
-}
-
-.dhis2-list-table-striped {
- width: 100%;
- padding-bottom: 6px;
-}
-
-.dhis2-list-table-striped>thead>tr,
-.dhis2-list-table-striped>tbody>tr,
-.dhis2-list-table-striped>tfoot>tr,
-.dhis2-list-table-striped>thead>tr,
-.dhis2-list-table-striped>tbody>tr,
-.dhis2-list-table-striped>tfoot>tr {
- border: none;
-}
-
-.dhis2-list-table-striped > tbody > tr:nth-child(odd)> td, .dhis2-table-striped > tbody > tr:nth-child(odd)> th {
- background-color: #ebf0f6
-}
-
-.dhis2-table-hover > tbody > tr:hover > td, .table-hover > tbody > tr:hover > th {
- background-color: #dfe9f4;
-}
-
-.top-bar {
- font-size: 16pt;
- font-weight: normal;
- color: #585D61;
-}
-
-.horizontal-spacing{
- margin-left: 10px;
- margin-right: 10px;
-}
-
-.trim {
- margin-bottom: 5px;
- margin-top: 5px;
}
\ No newline at end of file
