Skip to content

Commit

Permalink
Updated CSS to maintain the same table style in bi-server 5.1
Browse files Browse the repository at this point in the history
  • Loading branch information
Luca Pazzaglia committed Jun 9, 2014
1 parent 2d6fdd9 commit 6996e89
Show file tree
Hide file tree
Showing 7 changed files with 283 additions and 213 deletions.
16 changes: 8 additions & 8 deletions BTable-common/resources/components/BTable/lib/bt.table.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3201,20 +3201,20 @@ bt.components.BTable = function(spec) {
var defaultStyle = {
rules: [
{selector: "table", properties: [{name: "border-collapse", value: "collapse"}]},
{selector: "th", properties: [{name: "border", value: "1px solid #000"}, {name: "background-color", value: "#C3D9FF"}]},
{selector: "th", properties: [{name: "border", value: "1px solid #000"}, {name: "background-color", value: "#C3D9FF"}, {name: "font-family", value: "Arial, serif"}, {name: "font-size", value: "9pt"}]},
{selector: "td", properties: [{name: "border", value: "1px solid #000"}]},
{selector: "tbody tr.odd td", properties: [{name: "background-color", value: "#E2E4FF"}]},
{selector: "tbody tr.even td", properties: [{name: "background-color", value: "#FFFFFF"}]},
{selector: "td.string", properties: [{name: "font-family", value: "Arial, serif"}, {name: "font-size", value: "12px"}]},
{selector: "td.numeric", properties: [{name: "font-family", value: "Arial, serif"}, {name: "font-size", value: "12px"}, {name: "padding-right", value: "4px"}]},
{selector: "td.string", properties: [{name: "font-family", value: "Arial, serif"}, {name: "font-size", value: "9pt"}]},
{selector: "td.numeric", properties: [{name: "font-family", value: "Arial, serif"}, {name: "font-size", value: "9pt"}]},
{selector: "td.subtotal", properties: [{name: "font-weight", value: "bold"}]},
{selector: "tr.odd td.grandtotal", properties: [{name: "font-weight", value: "bold"}, {name: "background-color", value: "#C3D9FF"}]},
{selector: "tr.even td.grandtotal", properties: [{name: "font-weight", value: "bold"}, {name: "background-color", value: "#C3D9FF"}]},
{selector: ".filtersTitle", properties: [{name: "font-weight", value: "bold"}, {name: "color", value: "black"}]},
{selector: ".hierarchy", properties: [{name: "font-weight", value: "bold"}, {name: "color", value: "blue"}]},
{selector: ".separator", properties: [{name: "font-weight", value: "normal"}, {name: "color", value: "blue"}]},
{selector: ".level", properties: [{name: "font-weight", value: "bold"}, {name: "color", value: "red"}]},
{selector: ".filter", properties: [{name: "font-weight", value: "normal"}]}
{selector: ".filtersTitle", properties: [{name: "font-weight", value: "bold"}, {name: "color", value: "black"}, {name: "font-family", value: "Arial, serif"}, {name: "font-size", value: "9pt"}]},
{selector: ".hierarchy", properties: [{name: "font-weight", value: "bold"}, {name: "color", value: "blue"}, {name: "font-family", value: "Arial, serif"}, {name: "font-size", value: "9pt"}]},
{selector: ".separator", properties: [{name: "font-weight", value: "normal"}, {name: "color", value: "blue"}, {name: "font-family", value: "Arial, serif"}, {name: "font-size", value: "9pt"}]},
{selector: ".level", properties: [{name: "font-weight", value: "bold"}, {name: "color", value: "red"}, {name: "font-family", value: "Arial, serif"}, {name: "font-size", value: "9pt"}]},
{selector: ".filter", properties: [{name: "font-weight", value: "normal"}, {name: "font-family", value: "Arial, serif"}, {name: "font-size", value: "9pt"}]}
]
};

Expand Down
22 changes: 21 additions & 1 deletion BTable-common/resources/components/BTable/lib/btable.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -190,9 +190,12 @@ img.unlockedIcon {
.bTableComponent th {
border: 1px solid #000;
background-color: #C3D9FF;
font-family: Arial, serif;
font-size: 12px;
}
.bTableComponent td {
border: 1px solid #000;
padding: 4px 4px 4px 4px;
}
.bTableComponent tbody tr.odd td {
background-color: #FFFFFF;
Expand All @@ -207,7 +210,6 @@ img.unlockedIcon {
.bTableComponent td.numeric {
font-family: Arial, serif;
font-size: 12px;
padding-right: 4px;
white-space: nowrap;
}
.bTableComponent td.subtotal {
Expand All @@ -218,3 +220,21 @@ img.unlockedIcon {
font-weight: bold;
background-color: #C3D9FF;
}

.bTableComponent table.dataTable.no-footer {
border-bottom: none;
}
.bTableComponent table.dataTable {
box-sizing: border-box;
}
.bTableComponent table.dataTable thead th {
border: 1px solid #000;
background-color: #C3D9FF;
padding: 4px 4px 4px 4px;
font-family: Arial, serif;
font-size: 12px;
}
.bTableComponent table.dataTable tbody td {
border: 1px solid #000;
padding: 4px 4px 4px 4px;
}
122 changes: 61 additions & 61 deletions BTable-common/solution/BTable/BTable From File With Override.cdfde
View file
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@
},
{
"name": "resourceCode",
"value": ".container {margin-top: 20px; margin-bottom: 20px;}\n\n/******************** FILTERS PANEL ********************/\n.filtersPanel {margin-bottom: 10px;}\n.filtersPanel .filtersTitle {font-weight: bold; color: black;}\n.filtersPanel .hierarchy {font-weight: bold;color: #437C0D;}\n.filtersPanel .separator {font-weight: normal;color: #437C0D;}\n.filtersPanel .level {font-weight: bold; color: #D1380E;}\n.filtersPanel .filter {font-weight: normal;}\n\n/************************* TABLE ***********************/\n.bTableComponent .dataTables_wrapper {min-height:0;}\n.bTableComponent table {border-collapse: collapse;}\n.bTableComponent th {border: 1px solid #000; background-color: #A2E069;}\n.bTableComponent td {border: 1px solid #000;}\n.bTableComponent tbody tr.odd td {background-color: #FFFFFF;}\n.bTableComponent tbody tr.even td {background-color: #E8E8E8;}\n.bTableComponent .string {font-family: Arial, serif; font-size: 12px;}\n.bTableComponent .numeric {font-family: Arial, serif; font-size: 12px; padding-right: 4px;}\n.bTableComponent .subtotal {font-weight: bold;}\n.bTableComponent tr.even td.grandtotal, \n.bTableComponent tr.odd td.grandtotal {font-weight: bold; background-color: #A2E069;} ",
"value": ".container {margin-top: 20px; margin-bottom: 20px;}\n\n/******************** FILTERS PANEL ********************/\n.filtersPanel {margin-bottom: 10px;}\n.filtersPanel .filtersTitle {font-weight: bold; color: black;}\n.filtersPanel .hierarchy {font-weight: bold;color: #437C0D;}\n.filtersPanel .separator {font-weight: normal;color: #437C0D;}\n.filtersPanel .level {font-weight: bold; color: #D1380E;}\n.filtersPanel .filter {font-weight: normal;}\n\n/************************* TABLE ***********************/\n.bTableComponent .dataTables_wrapper {min-height:0;}\n.bTableComponent table {border-collapse: collapse;}\n.bTableComponent th {border: 1px solid #000; background-color: #A2E069; font-family: Arial, serif; font-size: 12px;}\n.bTableComponent td {border: 1px solid #000; padding: 4px 4px 4px 4px;}\n.bTableComponent tbody tr.odd td {background-color: #FFFFFF;}\n.bTableComponent tbody tr.even td {background-color: #E8E8E8;}\n.bTableComponent td.string {font-family: Arial, serif; font-size: 12px;}\n.bTableComponent td.numeric {font-family: Arial, serif; font-size: 12px; white-space: nowrap;}\n.bTableComponent td.subtotal {font-weight: bold;}\n.bTableComponent tr.even td.grandtotal, \n.bTableComponent tr.odd td.grandtotal {font-weight: bold; background-color: #A2E069;}\n.bTableComponent table.dataTable.no-footer {border-bottom: none;}\n.bTableComponent table.dataTable {box-sizing: border-box;}\n.bTableComponent table.dataTable thead th {border: 1px solid #000; background-color: #A2E069; padding: 4px 4px 4px 4px; font-family: Arial, serif; font-size: 12px;}\n.bTableComponent table.dataTable tbody td {border: 1px solid #000; padding: 4px 4px 4px 4px;} ",
"type": "Resource"
}
]
Expand Down Expand Up @@ -184,6 +184,48 @@
},
"components": {
"rows": [
{
"id": "GENERIC",
"name": "Generic",
"type": "Label",
"typeDesc": "<i>Group</i>",
"parent": "UnIqEiD",
"properties": [
{
"name": "Group",
"value": "Generic",
"type": "Label"
}
]
},
{
"id": "4d2e74f2-6910-6de5-ecfb-52d33d994779",
"type": "ComponentsJavascriptParameter",
"typeDesc": "Custom parameter",
"parent": "GENERIC",
"properties": [
{
"name": "name",
"value": "markets",
"type": "Id"
},
{
"name": "javaScript",
"value": "[\"NA\"]",
"type": "JavaScript"
},
{
"name": "parameterViewRole",
"value": "unused",
"type": "parameterViewRoleCustom"
},
{
"name": "bookmarkable",
"value": "false",
"type": "Boolean"
}
]
},
{
"id": "COMMUNITYCOMPONENTS",
"name": "Community Contributions",
Expand All @@ -199,7 +241,7 @@
]
},
{
"id": "aeb682bb-c0ab-9259-3738-161075be268f",
"id": "591d7092-7ea0-7a0f-5461-da60117035fe",
"type": "ComponentsBTableComponent",
"typeDesc": "BTable (by Biz Tech)",
"parent": "COMMUNITYCOMPONENTS",
Expand Down Expand Up @@ -330,18 +372,23 @@
"type": "ValuesArray"
},
{
"name": "paginate",
"name": "expandOnClick",
"value": "false",
"type": "Boolean"
},
{
"name": "paginate",
"value": "true",
"type": "Boolean"
},
{
"name": "filter",
"value": "false",
"value": "true",
"type": "Boolean"
},
{
"name": "info",
"value": "false",
"value": "true",
"type": "Boolean"
},
{
Expand All @@ -355,20 +402,15 @@
"type": "Boolean"
},
{
"name": "expandOnClick",
"value": "false",
"type": "Boolean"
"name": "drawCallback",
"value": "",
"type": "JavaScript"
},
{
"name": "colSearchable",
"value": "[]",
"type": "Array"
},
{
"name": "drawCallback",
"value": "",
"type": "JavaScript"
},
{
"name": "sDom",
"value": "",
Expand All @@ -391,7 +433,7 @@
},
{
"name": "tableStyle",
"value": "classic",
"value": "themeroller",
"type": "TableStyle"
},
{
Expand All @@ -400,18 +442,18 @@
"type": "HtmlObject"
},
{
"name": "paginateServerside",
"value": "false",
"name": "executeAtStart",
"value": "true",
"type": "Boolean"
},
{
"name": "executeAtStart",
"value": "true",
"name": "paginateServerside",
"value": "false",
"type": "Boolean"
},
{
"name": "preExecution",
"value": "function f() {\n this.exportStyle = { //table style for Excel\n rules: [\n {selector: \"table\", properties: [{name: \"border-collapse\", value: \"collapse\"}]},\n {selector: \"th\", properties: [{name: \"border\", value: \"1px solid #000\"}, {name: \"background-color\", value: \"#A2E069\"}]},\n {selector: \"td\", properties: [{name: \"border\", value: \"1px solid #000\"}]},\n {selector: \"tbody tr.odd td\", properties: [{name: \"background-color\", value: \"#FFFFFF\"}]},\n {selector: \"tbody tr.even td\", properties: [{name: \"background-color\", value: \"#E8E8E8\"}]},\n {selector: \"td.string\", properties: [{name: \"font-family\", value: \"Arial, serif\"}, {name: \"font-size\", value: \"12px\"}]},\n {selector: \"td.numeric\", properties: [{name: \"font-family\", value: \"Arial, serif\"}, {name: \"font-size\", value: \"12px\"}, {name: \"padding-right\", value: \"4px\"}]},\n {selector: \"td.subtotal\", properties: [{name: \"font-weight\", value: \"bold\"}]},\n {selector: \"tr.odd td.grandtotal\", properties: [{name: \"font-weight\", value: \"bold\"}, {name: \"background-color\", value: \"#A2E069\"}]},\n {selector: \"tr.even td.grandtotal\", properties: [{name: \"font-weight\", value: \"bold\"}, {name: \"background-color\", value: \"#A2E069\"}]},\n {selector: \".filtersTitle\", properties: [{name: \"font-weight\", value: \"bold\"}, {name: \"color\", value: \"black\"}]},\n {selector: \".hierarchy\", properties: [{name: \"font-weight\", value: \"bold\"}, {name: \"color\", value: \"#437C0D\"}]},\n {selector: \".separator\", properties: [{name: \"font-weight\", value: \"normal\"}, {name: \"color\", value: \"#437C0D\"}]},\n {selector: \".level\", properties: [{name: \"font-weight\", value: \"bold\"}, {name: \"color\", value: \"#D1380E\"}]},\n {selector: \".filter\", properties: [{name: \"font-weight\", value: \"normal\"}]}\n\t\t]\n\t};\n}\n",
"value": "function f() {\n this.exportStyle = { //table style for Excel\n rules: [\n {selector: \"th\", properties: [{name: \"border\", value: \"1px solid #000\"}, {name: \"background-color\", value: \"#A2E069\"}, {name: \"font-family\", value: \"Arial, serif\"}, {name: \"font-size\", value: \"9pt\"}]},\n {selector: \"td\", properties: [{name: \"border\", value: \"1px solid #000\"}]},\n {selector: \"tbody tr.odd td\", properties: [{name: \"background-color\", value: \"#FFFFFF\"}]},\n {selector: \"tbody tr.even td\", properties: [{name: \"background-color\", value: \"#E8E8E8\"}]},\n {selector: \"td.string\", properties: [{name: \"font-family\", value: \"Arial, serif\"}, {name: \"font-size\", value: \"9pt\"}]},\n {selector: \"td.numeric\", properties: [{name: \"font-family\", value: \"Arial, serif\"}, {name: \"font-size\", value: \"9pt\"}]},\n {selector: \"td.subtotal\", properties: [{name: \"font-weight\", value: \"bold\"}]},\n {selector: \"tr.odd td.grandtotal\", properties: [{name: \"font-weight\", value: \"bold\"}, {name: \"background-color\", value: \"#A2E069\"}]},\n {selector: \"tr.even td.grandtotal\", properties: [{name: \"font-weight\", value: \"bold\"}, {name: \"background-color\", value: \"#A2E069\"}]},\n {selector: \".filtersTitle\", properties: [{name: \"font-weight\", value: \"bold\"}, {name: \"color\", value: \"black\"}, {name: \"font-family\", value: \"Arial, serif\"}, {name: \"font-size\", value: \"9pt\"}]},\n {selector: \".hierarchy\", properties: [{name: \"font-weight\", value: \"bold\"}, {name: \"color\", value: \"#437C0D\"}, {name: \"font-family\", value: \"Arial, serif\"}, {name: \"font-size\", value: \"9pt\"}]},\n {selector: \".separator\", properties: [{name: \"font-weight\", value: \"normal\"}, {name: \"color\", value: \"#437C0D\"}, {name: \"font-family\", value: \"Arial, serif\"}, {name: \"font-size\", value: \"9pt\"}]},\n {selector: \".level\", properties: [{name: \"font-weight\", value: \"bold\"}, {name: \"color\", value: \"#D1380E\"}, {name: \"font-family\", value: \"Arial, serif\"}, {name: \"font-size\", value: \"9pt\"}]},\n {selector: \".filter\", properties: [{name: \"font-weight\", value: \"normal\"}, {name: \"font-family\", value: \"Arial, serif\"}, {name: \"font-size\", value: \"9pt\"}]}\n \t]\n\t};\n}",
"type": "JavaScript"
},
{
Expand Down Expand Up @@ -450,48 +492,6 @@
"type": "JavaScript"
}
]
},
{
"id": "GENERIC",
"name": "Generic",
"type": "Label",
"typeDesc": "<i>Group</i>",
"parent": "UnIqEiD",
"properties": [
{
"name": "Group",
"value": "Generic",
"type": "Label"
}
]
},
{
"id": "4d2e74f2-6910-6de5-ecfb-52d33d994779",
"type": "ComponentsJavascriptParameter",
"typeDesc": "Custom parameter",
"parent": "GENERIC",
"properties": [
{
"name": "name",
"value": "markets",
"type": "Id"
},
{
"name": "javaScript",
"value": "[\"NA\"]",
"type": "JavaScript"
},
{
"name": "parameterViewRole",
"value": "unused",
"type": "parameterViewRoleCustom"
},
{
"name": "bookmarkable",
"value": "false",
"type": "Boolean"
}
]
}
]
},
Expand Down
Loading

0 comments on commit 6996e89

Please sign in to comment.