Permalink
Browse files

Change how we load user feed in the right panel (do not send html dir…

…ectly)
  • Loading branch information...
1 parent 8031274 commit d3eb6a1ea77f2fe80e207f8af5a8fa496341ba54 @cdujeu cdujeu committed Sep 13, 2016
@@ -291,7 +291,7 @@ public function loadUserFeed(\Psr\Http\Message\ServerRequestInterface $requestIn
continue;
}
$node->event_description = ucfirst($notif->getDescriptionBlock()) . " ".$mess["notification.tpl.block.user_link"] ." ". $notif->getAuthorLabel();
- $node->event_description_long = $notif->getDescriptionLong(true);
+ $node->event_description_long = strip_tags($notif->getDescriptionLong(true));
$node->event_date = StatHelper::relativeDate($notif->getDate(), $mess);
$node->short_date = StatHelper::relativeDate($notif->getDate(), $mess, true);
$node->event_time = $notif->getDate();
@@ -311,7 +311,9 @@ public function loadUserFeed(\Psr\Http\Message\ServerRequestInterface $requestIn
if(isSet($httpVars["description_as_label"]) && $httpVars["description_as_label"] == "true"){
$node->setLabel($node->event_description." ".$node->event_date);
}else{
- $node->setLabel(basename($node->getPath())." <small class='notif_desc'>".$node->event_description." ".$node->event_date."</small>");
+ $node->setLabel(basename($node->getPath()));
+ $node->ajxp_description = $node->event_description .' ' . $node->event_date;
+ //$node->setLabel(basename($node->getPath())." ".$node->event_description." ".$node->event_date);
}
}
$url = parse_url($node->getUrl());
@@ -469,7 +471,7 @@ public function loadUserAlerts(\Psr\Http\Message\ServerRequestInterface $request
}
$node->event_is_alert = true;
$node->event_description = ucfirst($notification->getDescriptionBlock()) . " ".$mess["notification.tpl.block.user_link"] ." ". $notification->getAuthorLabel();
- $node->event_description_long = $notification->getDescriptionLong(true);
+ $node->event_description_long = strip_tags($notification->getDescriptionLong(true));
$node->event_date = StatHelper::relativeDate($notification->getDate(), $mess);
$node->event_type = "alert";
$node->alert_id = $notification->alert_id;
@@ -338,7 +338,8 @@ Class.create("NotificationLoader", {
"columnsDef":[
{"attributeName":"ajxp_label", "messageId":1, "sortType":"String"},
{"attributeName":"event_time", "messageString":"Time", "sortType":"Number"},
- {"attributeName":"event_type", "messageString":"Type", "sortType":"String"}],
+ {"attributeName":"event_description", "messageString":"Description", "sortType":"String"}
+ ],
"silentLoading":true,
"fixedSortColumn":"event_time",
"fixedSortDirection":"desc",
Oops, something went wrong.
@@ -6,7 +6,7 @@
@infopanel_values_color:#555;
@infopanel_quick_button_border:1px dotted #999;
-@infopanel_fetchedpane_text_color: #222;
+@infopanel_fetchedpane_text_color: #666;
@infopanel_fetchedpane_legend_color: #666;
@infopanel_toolbar_buttons_radius:0;
@@ -119,27 +119,47 @@
div.class-FetchedResultPane{
- font-size: 13px;
div.thumbnail_selectable_cell.detailed{
- padding: 0;
+ padding: 0 0 16px;
cursor: default;
div.thumbnail_selectable_cell{
display: none;
}
div.thumbLabel{
- font-size: 1.1em;
+ font-size: 15px;
color: @infopanel_fetchedpane_text_color;
white-space: normal;
- line-height: 1.5em;
padding-top: 0;
- padding-bottom: 8px;
+ font-weight: 400;
small {
color: @infopanel_fetchedpane_legend_color;
display: block;
font-size: 0.8em;
line-height: 15px;
}
}
+ div.thumbnail_cell_metadata{
+ display: block;
+ opacity: 0.9;
+ .metadata_chunk.metadata_chunk_description{
+ font-size: 12px;
+ opacity: 1 !important;
+ color: @infopanel_fetchedpane_legend_color !important;
+ white-space: normal;
+ }
+ .metadata_chunk.metadata_chunk_standard{
+ display: none;
+ }
+ }
+ &.selected-focus{
+ div.thumbnail_cell_metadata{
+ opacity: 0.9;
+ }
+ div.thumbLabel{
+ color: @infopanel_fetchedpane_text_color;
+ font-weight: 400;
+ }
+ }
}
&.leaf_activity div.thumbnail_selectable_cell.detailed div.thumbLabel
{
@@ -5229,13 +5229,9 @@ div.menu.rootDirChooser span.rootDirTitle {
.form-ip_content_info_panel div.folded_icons {
display: none;
}
-#info_panel div.class-FetchedResultPane,
-.form-ip_content_info_panel div.class-FetchedResultPane {
- font-size: 13px;
-}
#info_panel div.class-FetchedResultPane div.thumbnail_selectable_cell.detailed,
.form-ip_content_info_panel div.class-FetchedResultPane div.thumbnail_selectable_cell.detailed {
- padding: 0;
+ padding: 0 0 16px;
cursor: default;
}
#info_panel div.class-FetchedResultPane div.thumbnail_selectable_cell.detailed div.thumbnail_selectable_cell,
@@ -5244,12 +5240,11 @@ div.menu.rootDirChooser span.rootDirTitle {
}
#info_panel div.class-FetchedResultPane div.thumbnail_selectable_cell.detailed div.thumbLabel,
.form-ip_content_info_panel div.class-FetchedResultPane div.thumbnail_selectable_cell.detailed div.thumbLabel {
- font-size: 1.1em;
- color: #222222;
+ font-size: 15px;
+ color: #666666;
white-space: normal;
- line-height: 1.5em;
padding-top: 0;
- padding-bottom: 8px;
+ font-weight: 400;
}
#info_panel div.class-FetchedResultPane div.thumbnail_selectable_cell.detailed div.thumbLabel small,
.form-ip_content_info_panel div.class-FetchedResultPane div.thumbnail_selectable_cell.detailed div.thumbLabel small {
@@ -5258,6 +5253,31 @@ div.menu.rootDirChooser span.rootDirTitle {
font-size: 0.8em;
line-height: 15px;
}
+#info_panel div.class-FetchedResultPane div.thumbnail_selectable_cell.detailed div.thumbnail_cell_metadata,
+.form-ip_content_info_panel div.class-FetchedResultPane div.thumbnail_selectable_cell.detailed div.thumbnail_cell_metadata {
+ display: block;
+ opacity: 0.9;
+}
+#info_panel div.class-FetchedResultPane div.thumbnail_selectable_cell.detailed div.thumbnail_cell_metadata .metadata_chunk.metadata_chunk_description,
+.form-ip_content_info_panel div.class-FetchedResultPane div.thumbnail_selectable_cell.detailed div.thumbnail_cell_metadata .metadata_chunk.metadata_chunk_description {
+ font-size: 12px;
+ opacity: 1 !important;
+ color: #666666 !important;
+ white-space: normal;
+}
+#info_panel div.class-FetchedResultPane div.thumbnail_selectable_cell.detailed div.thumbnail_cell_metadata .metadata_chunk.metadata_chunk_standard,
+.form-ip_content_info_panel div.class-FetchedResultPane div.thumbnail_selectable_cell.detailed div.thumbnail_cell_metadata .metadata_chunk.metadata_chunk_standard {
+ display: none;
+}
+#info_panel div.class-FetchedResultPane div.thumbnail_selectable_cell.detailed.selected-focus div.thumbnail_cell_metadata,
+.form-ip_content_info_panel div.class-FetchedResultPane div.thumbnail_selectable_cell.detailed.selected-focus div.thumbnail_cell_metadata {
+ opacity: 0.9;
+}
+#info_panel div.class-FetchedResultPane div.thumbnail_selectable_cell.detailed.selected-focus div.thumbLabel,
+.form-ip_content_info_panel div.class-FetchedResultPane div.thumbnail_selectable_cell.detailed.selected-focus div.thumbLabel {
+ color: #666666;
+ font-weight: 400;
+}
#info_panel div.class-FetchedResultPane.leaf_activity div.thumbnail_selectable_cell.detailed div.thumbLabel,
.form-ip_content_info_panel div.class-FetchedResultPane.leaf_activity div.thumbnail_selectable_cell.detailed div.thumbLabel {
color: #555555;
@@ -229,7 +229,7 @@
@infopanel_quick_button_border:1px dotted #999;
@infopanel_section_title_color:#333;
-@infopanel_fetchedpane_text_color: #222;
+@infopanel_fetchedpane_text_color: #666;
@infopanel_fetchedpane_legend_color: #666;
@infopanel_share_button_tint:@colorCodeShared;

0 comments on commit d3eb6a1

Please sign in to comment.