update Piwik to version 2.16 (fixes #91)

This commit is contained in:
oliver 2016-04-10 18:55:57 +02:00
commit d885a4baa9
5833 changed files with 418860 additions and 226988 deletions

View file

@ -9,16 +9,15 @@
td .ratio {
color: #999999;
font-size: 12px;
display:none;
display: inline-block;
visibility: hidden;
text-align: right;
min-width: 45px;
margin-left: 4px;
margin-right: 4px;
font-weight: normal;
}
td.highlight > .ratio {
display: inline-block;
line-height: 15px;
visibility: visible;
}
}
@ -43,6 +42,10 @@ table.dataTable img {
margin-left: 0.5em;
}
table.subDataTable img.link {
transform: translateY(-50%);
}
table.dataTable tr.subDataTable {
cursor: pointer;
@ -63,7 +66,6 @@ table.dataTable th {
background: @dataTable-header-background;
font-size: 12px;
font-weight: normal;
border-left: 1px solid #d4d0c4;
vertical-align: top;
}
@ -73,56 +75,29 @@ table.dataTable th.sortable {
table.dataTable th.columnSorted {
font-weight: bold;
padding-right: 20px;
background: @dataTable-headerActive-background;
}
table.dataTable td {
padding: 5px 5px 5px 12px;
background: #fff;
border-left: 1px solid #e7e7e7;
padding: 5px 1px 5px 12px;
background: @theme-color-background-base;
}
table.dataTable td,
table.dataTable td a {
margin: 0;
text-decoration: none;
color: #444;
}
table.dataTable tr:hover > td,
table.dataTable tr:hover > td .dataTableRowActions {
background-color: #FFFFF7;
}
table.dataTable tr.subDataTable:hover > td,
table.dataTable tr.subDataTable:hover > td .dataTableRowActions {
background-color: #ffffcb;
}
table.dataTable tr:hover > td.cellSubDataTable
table.dataTable tr:hover > td.cellSubDataTable .dataTableRowActions {
background-color: #fff;
color: @theme-color-text-light;
}
td.clean {
background-color: #fff;
background-color: @theme-color-background-base;
}
table.dataTable td.column {
white-space: nowrap;
}
table.dataTable td.columneven {
background: #efeeec;
}
table.dataTable td.columnodd {
background: #f6f5f3;
}
.dataTable tr.highlight td {
background-color: #ECF9DD;
font-weight: bold;
}
@ -170,12 +145,17 @@ table.dataTable img {
width: 450px;
}
div.dataTable, div.dataTable > .dataTableWrapper {
margin-bottom: 9px; // same height as expand/contract button (so datatable height will encompass the
// expand/contract button)
}
.subDataTable > .dataTableWrapper {
width: 95%;
}
.sortIconContainer {
float: right;
float: left;
position: relative;
}
@ -188,6 +168,7 @@ table.dataTable img {
color: #888;
text-align: left;
margin: 10px;
margin-left: 1px;
}
.dataTablePages {
@ -202,7 +183,7 @@ table.dataTable img {
height: 20px;
display: block;
white-space: nowrap;
background: url(plugins/Zeitgeist/images/search_bg.png) no-repeat center 0;
background: url(plugins/Morpheus/images/search_bg.png) no-repeat center 0;
text-align: center;
}
@ -224,7 +205,7 @@ table.dataTable img {
width: 114px;
height: auto;
overflow: visible;
padding: 2px 6px;
padding: 2px 6px !important;
opacity: 1;
cursor: text;
filter: Alpha(opacity=100);
@ -285,102 +266,147 @@ table.dataTable img {
padding-bottom: 4px;
}
#dashboard {
.dataTableFeatures {
&.expanded {
.dataTableFooterIcons {
display: block;
}
.expandDataTableFooterDrawer {
display: none;
}
}
&.hasEvolution {
.dataTableFooterIcons {
margin-top: 17px;
}
.expandDataTableFooterDrawer {
margin-top: 20px;
}
.dataTableFeatures {
&.expanded {
.dataTableFooterIcons {
display: block;
}
.expandDataTableFooterDrawer {
display: block;
margin-top: 5px;
margin-bottom: 0px;
margin-left: auto;
margin-right: auto;
background-color: #D9D9D9;
height: 7px;
width: 70px;
-webkit-border-top-left-radius: 10px;
-webkit-border-top-right-radius: 10px;
-moz-border-radius-topleft: 10px;
-moz-border-radius-topright: 10px;
border-top-left-radius: 10px;
border-top-right-radius: 10px;
line-height: 0px;
img {
margin-bottom: 0px;
line-height: 0px;
}
display: none;
}
}
.dataTableFooterIcons {
&.hasEvolution {
.dataTableFooterIcons {
margin-top: 17px;
}
.expandDataTableFooterDrawer {
margin-top: 20px;
}
}
display: none;
.expandDataTableFooterDrawer {
display: block;
margin-top: 5px;
height: auto;
margin-bottom: -1px;
margin-left: auto;
margin-right: auto;
background-color: @theme-color-widget-background;
border: 1px solid @theme-color-background-tinyContrast;
height: 9px;
width: 70px;
-webkit-border-bottom-left-radius: 10px;
-webkit-border-bottom-right-radius: 10px;
-moz-border-radius-bottomleft: 10px;
-moz-border-radius-bottomright: 10px;
border-bottom-left-radius: 10px;
border-bottom-right-radius: 10px;
line-height: 0px;
div {
padding-bottom: 2px;
}
.foldDataTableFooterDrawer {
display: block;
padding-bottom: 0px;
margin-top: 0px;
margin-left: auto;
margin-right: auto;
background-color: #D9D9D9;
-webkit-border-top-left-radius: 10px;
-webkit-border-top-right-radius: 10px;
-moz-border-radius-topleft: 10px;
-moz-border-radius-topright: 10px;
border-top-left-radius: 10px;
border-top-right-radius: 10px;
img {
margin-bottom: 0px;
line-height: 0px;
height: 7px;
width: 70px;
clear: both;
img {
margin-top: 2px;
margin-bottom: 0px;
line-height: 0px;
}
}
}
}
.controls {
padding: 15px 0px;
text-align: left;
color: #333;
.dataTableFeatures {
border-bottom: 1px solid @theme-color-background-tinyContrast;
}
.widget .dataTableFeatures {
border-bottom-style: none !important;
}
.dataTableFooterIcons {
display: none;
margin-top: 5px;
height: auto;
div {
padding-bottom: 2px;
}
.foldDataTableFooterDrawer {
display: block;
padding-bottom: 0px;
margin-bottom: -1px;
margin-top: 0px;
margin-left: auto;
margin-right: auto;
background-color: @theme-color-widget-background;
border: 1px solid @theme-color-background-tinyContrast;
-webkit-border-top-left-radius: 10px;
-webkit-border-top-right-radius: 10px;
-moz-border-radius-topleft: 10px;
-moz-border-radius-topright: 10px;
border-top-left-radius: 10px;
border-top-right-radius: 10px;
line-height: 0px;
height: 9px;
width: 70px;
clear: both;
img {
margin-top: 2px;
margin-bottom: 0px;
line-height: 0px;
}
}
.controls {
clear: left;
padding: 0px 0px 15px;
text-align: left;
color: #333;
}
}
#dashboard .dataTableFeatures,.widget .dataTableFeatures {
.expandDataTableFooterDrawer {
-webkit-border-top-left-radius: 10px;
-webkit-border-top-right-radius: 10px;
-moz-border-radius-topleft: 10px;
-moz-border-radius-topright: 10px;
border-top-left-radius: 10px;
border-top-right-radius: 10px;
-webkit-border-bottom-left-radius: 0px;
-webkit-border-bottom-right-radius: 0px;
-moz-border-radius-bottomleft: 0px;
-moz-border-radius-bottomright: 0px;
border-bottom-left-radius: 0px;
border-bottom-right-radius: 0px;
}
}
.dataTableFooterIcons .foldDataTableFooterDrawer,
.dataTableFeatures .expandDataTableFooterDrawer {
display: none;
cursor: pointer;
}
.widget .foldDataTableFooterDrawer {
margin-bottom: -9px;
}
// customizing footer appearance for row evolution graph
.ui-dialog .dataTableVizEvolution {
.expandDataTableFooterDrawer,.foldDataTableFooterDrawer {
display: none !important;
}
.dataTableFooterIcons {
display: block;
}
.dataTableFeatures {
border-bottom-style: none !important;
margin-top: 0 !important;
}
}
@-moz-document url-prefix() {
#dashboard .dataTableFeatures .expandDataTableFooterDrawer {
@ -394,10 +420,10 @@ table.dataTable img {
}
.dataTableFooterIcons {
height: 20px;
min-height: 26px;
white-space: nowrap;
font-size: 10px;
padding: 6px 5px;
padding: 6px 5px 0px;
border-top: 1px solid #B6B0A6;
}
@ -498,7 +524,7 @@ table.dataTable img {
}
/* Actions table */
.dataTableActions table.dataTable tr td.labelodd {
.dataTableActions table.dataTable tr td.label {
background-image: none;
}
@ -559,7 +585,7 @@ tr.level12 td.label {
}
tr td.label img.plusMinus {
margin-left: -1em;
margin-left: -10px;
margin-right: 3px;
margin-top: -5px;
}
@ -567,8 +593,13 @@ tr td.label img.plusMinus {
.pk-emptyDataTable {
padding-top: 20px;
padding-bottom: 10px;
padding-left: 1px;
}
.widget .pk-emptyDataTable {
padding-left: 0px;
padding-top: 33px;
text-align: center;
font-style: italic;
}
.helpDate {
@ -610,4 +641,4 @@ td.cellSubDataTable .loadingPiwik {
cursor: pointer;
display: inline;
}
}
}

View file

@ -13,11 +13,11 @@
.limitSelection > div {
border: 1px solid #DFDFDF;
border-radius: 4px;
background: url(plugins/Zeitgeist/images/sort_subtable_desc_light.png) no-repeat right 2px;
background: url(plugins/Morpheus/images/sort_subtable_desc_light.png) no-repeat right 2px;
padding: 0 14px 0 4px;
display: block;
width: 24px;
height: 20px;
width: 41px;
height: 26px;
cursor: pointer;
}
@ -29,24 +29,23 @@
.limitSelection.visible > div {
border-radius: 0 0 4px 4px;
background-image: url(plugins/Zeitgeist/images/sort_subtable_asc_light.png)
background-image: url(plugins/Morpheus/images/sort_subtable_asc_light.png)
}
.limitSelection > ul {
margin-top: 1px;
overflow: visible;
background-color: #fff;
background-color: @theme-color-background-base;
}
.limitSelection > ul > li {
cursor: pointer;
width: 28px;
padding: 0 10px 0 4px;
font-size: 1.1em;
font-weight: bold;
height: 20px;
margin-top: -40px;
background-color: #fff;
background-color: @theme-color-background-base;
border-left: 1px solid #DFDFDF;
border-right: 1px solid #DFDFDF;
vertical-align: middle;
@ -65,4 +64,4 @@
.limitSelection span {
padding-top: 3px;
display: inline-block;
}
}

View file

@ -4,7 +4,7 @@ table.dataTable th .columnDocumentation {
width: 165px;
text-align: left;
background: #f7f7f7;
color: #444;
color: @theme-color-text-light;
font-size: 11px;
font-weight: normal;
border: 1px solid #e4e5e4;
@ -17,9 +17,8 @@ table.dataTable th .columnDocumentation {
}
table.dataTable th .columnDocumentationTitle {
background: url(plugins/Zeitgeist/images/help.png) no-repeat;
line-height: 14px;
padding: 2px 0 3px 21px;
padding: 3px 0;
font-weight: bold;
}
@ -38,24 +37,6 @@ table.dataTable th .columnDocumentationTitle {
.reportDocumentation p {
padding: 5px 10px 6px 10px;
margin: 0;
color: #444;
color: @theme-color-text-light;
font-size: 12px;
}
.reportDocumentationIcon {
display: block;
width: 16px;
height: 16px;
margin: 10px 0;
background: url(plugins/Zeitgeist/images/help.png) no-repeat;
}
h2 .reportDocumentationIcon {
position: absolute;
margin: 4px 0 0 0;
display: none;
}
h2 .reportDocumentationIcon.hidden {
background: none;
}

View file

@ -1,10 +1,10 @@
table.dataTable .dataTableRowActions {
position: absolute;
display: none;
overflow: hidden;
margin-top: -5px;
background-color: inherit !important;
z-index: 1000; /* Work around FF bug to make sure it displays over ellipsis */
}

View file

@ -14,7 +14,7 @@ table.subDataTable thead th {
border-bottom: 1px solid #e7e7e7;
}
table.subDataTable td.labeleven, table.subDataTable td.labelodd {
table.subDataTable td.label {
background-image: none;
}
@ -27,7 +27,7 @@ table.subDataTable td, table.subDataTable td a {
color: #615B53;
}
table.subDataTable td.labeleven, table.subDataTable td.columneven {
table.subDataTable td.label, table.subDataTable td.column {
color: #2D2A27;
}

View file

@ -10,7 +10,7 @@ a.tableConfigurationIcon {
display: block;
width: 30px;
height: 22px;
background: url(plugins/Zeitgeist/images/configure.png) no-repeat center 2px;
background: url(plugins/Morpheus/images/configure.png) no-repeat center 2px;
position: absolute;
z-index: 9;
right: 0;
@ -20,7 +20,7 @@ a.tableConfigurationIcon.highlighted {
display: block;
width: 30px;
height: 22px;
background-image: url(plugins/Zeitgeist/images/configure-highlight.png);
background-image: url(plugins/Morpheus/images/configure-highlight.png);
position: absolute;
z-index: 9;
right: 0;
@ -43,7 +43,7 @@ a.tableConfigurationIcon.highlighted {
font-size: 1.1em;
height: 40px;
margin-top: -80px;
background-color: #fff;
background-color: @theme-color-background-base;
border: 1px solid #DFDFDF;
border-width: 0 1px;
vertical-align: middle;
@ -70,7 +70,7 @@ a.tableConfigurationIcon.highlighted {
cursor: pointer;
padding: 5px 10px;
line-height: 15px;
color: #444;
color: @theme-color-text-light;
}
.tableConfiguration div.configItem:hover {
@ -79,4 +79,4 @@ a.tableConfigurationIcon.highlighted {
.tableConfiguration div.configItem span.action {
color: @dataTable-link-color;
}
}