Members
@@ -20,6 +21,8 @@ foreach ($orgs as $org):?>
+*/
+?>
element('histogram');?>
diff --git a/app/webroot/css/main.css b/app/webroot/css/main.css
index e775429ab..74cb76bec 100644
--- a/app/webroot/css/main.css
+++ b/app/webroot/css/main.css
@@ -1115,7 +1115,7 @@ a.proposal_link_red:hover {
.memberslistBar {
overflow: hidden;
- height:30px;
+ height:13px;
-webkit-border-radius: 2px;
-moz-border-radius: 2px;
border-radius: 2px;
@@ -1152,6 +1152,12 @@ a.proposal_link_red:hover {
box-shadow: 1px 1px 1px #888888;
}
+.histogram-legendH4{
+ margin-bottom: 0;
+}
+
+.membersList-histogram-legend .col{float: left;margin: 0 0.4em 0 0;}
+
.attributeListContainer{
position:relative;
margin-top:10px;
diff --git a/app/webroot/js/misp2.4.49.js b/app/webroot/js/misp2.4.49.js
index c7c571834..39bb03cd7 100644
--- a/app/webroot/js/misp2.4.49.js
+++ b/app/webroot/js/misp2.4.49.js
@@ -791,6 +791,10 @@ function handleValidationErrors(responseArray, context, contextNamingConvention)
}
}
+/**
+ * updates the histogram
+ * @param selected
+ */
function toggleHistogramType(type, old) {
var done = false;
old.forEach(function(entry) {
@@ -803,6 +807,11 @@ function toggleHistogramType(type, old) {
updateHistogram(JSON.stringify(old));
}
+/**
+ * toggles which fields are taken into account when rendering the histogram activity
+ * @param type
+ * @param old
+ */
function updateHistogram(selected) {
$.ajax({
beforeSend: function (XMLHttpRequest) {