dhis2-devs team mailing list archive
-
dhis2-devs team
-
Mailing list archive
-
Message #18483
[Branch ~dhis2-devs-core/dhis2/trunk] Rev 7807: Codestyle
------------------------------------------------------------
revno: 7807
committer: Lars Helge Overland <larshelge@xxxxxxxxx>
branch nick: dhis2
timestamp: Wed 2012-08-01 16:06:28 +0200
message:
Codestyle
modified:
dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/colorHelp.vm
dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/style/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-caseentry/src/main/webapp/dhis-web-caseentry/colorHelp.vm'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/colorHelp.vm 2012-08-01 14:00:17 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/colorHelp.vm 2012-08-01 14:06:28 +0000
@@ -1,13 +1,11 @@
<a href="javascript:showColorHelp()" id='colorHelpLink' title="$i18n.getString( 'what_do_colors_mean' )" class="hidden">$i18n.getString('what_do_colors_mean')</a>
<div id="colorHelpDiv" class="hidden history page">
- <table>
+ <table class="colorHelpTable">
<col width='80px;'/>
- <thead>
- <tr>
- <th>$i18n.getString('color')</th>
- <th>$i18n.getString('description')</th>
- </tr>
- </thead>
+ <tr>
+ <th>$i18n.getString('color')</th>
+ <th>$i18n.getString('description')</th>
+ </tr>
<tr>
<td id='colorGreenTD' class='input-column'><script>byId('colorGreenTD').style.backgroundColor = COLOR_GREEN;</script></td>
<td>$i18n.getString('completed_stages')</td>
=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/style/style.css'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/style/style.css 2012-07-10 14:17:54 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/style/style.css 2012-08-01 14:06:28 +0000
@@ -2,31 +2,37 @@
/* Form
/*----------------------------------------------------------------------------*/
-input[type="button"], input[type="submit"] {
+input[type="button"], input[type="submit"]
+{
width: 130px;
}
-input.small-button[type="button"] {
+input.small-button[type="button"]
+{
width: 30px;
}
-input.large-button[type="button"] {
+input.large-button[type="button"]
+{
width: 105px;
}
-input[type="text"] {
+input[type="text"]
+{
width: 260px;
}
-select {
- width: 265px;
-}
-
-textarea {
- width: 265px;
-}
-
-.button-list
+select
+{
+ width: 265px;
+}
+
+textarea
+{
+ width: 265px;
+}
+
+.button-list
{
text-align:right;
padding-bottom:10px;
@@ -37,17 +43,20 @@
/* Table
/*----------------------------------------------------------------------------*/
-table {
+table
+{
font-size: 13px;
line-height: 18px;
margin-bottom: 10px;
}
-.heading-column {
+.heading-column
+{
width: 400px;
}
-td.input-column {
+td.input-column
+{
padding-left: 5px;
padding-right: 1px;
}
@@ -56,22 +65,26 @@
padding-left: 1em;
}
-table.information, td.information
+table.information, td.information
{
border:1px solid #808080;
vertical-align:top;
padding:10px;
}
-.text-column {
+.text-column
+{
padding-left: 5px;
padding-right: 10px;
text-align: left;
}
-.errorCell{background-color: #FFCFCF}
+.errorCell
+{
+ background-color: #FFCFCF
+}
-#advanced-search
+#advanced-search
{
position: relative;
border: 1px solid #a4d2a3;
@@ -84,7 +97,7 @@
}
/*----------------------------------------------------------------------------*/
-/* button list
+/* Button list
/*----------------------------------------------------------------------------*/
.buttons
@@ -96,29 +109,29 @@
div.actions
{
- float: right;
- width: 170px;
- text-align: right;
+ float: right;
+ width: 170px;
+ text-align: right;
}
div.enrollment-form
{
- border:1px solid #c0c0c0;
- padding:10px;
- margin-right:10px;
- border-radius:3px;
+ border:1px solid #c0c0c0;
+ padding:10px;
+ margin-right:10px;
+ border-radius:3px;
}
/*----------------------------------------------------------------------------*/
-/* For data entry form */
+/* Data entry form */
/*----------------------------------------------------------------------------*/
.entryScreen
{
- margin-bottom:20px;
- width:70%;
- font-size: 13px;
- line-height:18px;
+ margin-bottom:20px;
+ width:70%;
+ font-size: 13px;
+ line-height:18px;
}
input.criteria
@@ -165,22 +178,26 @@
width:222px;
}
-div.provided-elsewhere{
+div.provided-elsewhere
+{
width:20px;
height:20px;
}
-.ui-button{
+.ui-button
+{
max-height: 100px;
max-height: 100px;
}
-.ui-autocomplete {
+.ui-autocomplete
+{
max-height: 100px;
overflow-y: auto;
overflow-x: hidden;
}
-.hidden {
+.hidden
+{
display: none;
}