Skip to content
This repository was archived by the owner on Nov 25, 2020. It is now read-only.

Commit d3eb6a1

Browse files
cdujeucdujeu
committed
Change how we load user feed in the right panel (do not send html directly)
1 parent 8031274 commit d3eb6a1

File tree

6 files changed

+64
-21
lines changed

6 files changed

+64
-21
lines changed

‎core/src/plugins/core.notifications/NotificationCenter.php

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -291,7 +291,7 @@ public function loadUserFeed(\Psr\Http\Message\ServerRequestInterface $requestIn
291291
continue;
292292
}
293293
$node->event_description = ucfirst($notif->getDescriptionBlock()) . " ".$mess["notification.tpl.block.user_link"] ." ". $notif->getAuthorLabel();
294-
$node->event_description_long = $notif->getDescriptionLong(true);
294+
$node->event_description_long = strip_tags($notif->getDescriptionLong(true));
295295
$node->event_date = StatHelper::relativeDate($notif->getDate(), $mess);
296296
$node->short_date = StatHelper::relativeDate($notif->getDate(), $mess, true);
297297
$node->event_time = $notif->getDate();
@@ -311,7 +311,9 @@ public function loadUserFeed(\Psr\Http\Message\ServerRequestInterface $requestIn
311311
if(isSet($httpVars["description_as_label"]) && $httpVars["description_as_label"] == "true"){
312312
$node->setLabel($node->event_description." ".$node->event_date);
313313
}else{
314-
$node->setLabel(basename($node->getPath())." <small class='notif_desc'>".$node->event_description." ".$node->event_date."</small>");
314+
$node->setLabel(basename($node->getPath()));
315+
$node->ajxp_description = $node->event_description .' ' . $node->event_date;
316+
//$node->setLabel(basename($node->getPath())." ".$node->event_description." ".$node->event_date);
315317
}
316318
}
317319
$url = parse_url($node->getUrl());
@@ -469,7 +471,7 @@ public function loadUserAlerts(\Psr\Http\Message\ServerRequestInterface $request
469471
}
470472
$node->event_is_alert = true;
471473
$node->event_description = ucfirst($notification->getDescriptionBlock()) . " ".$mess["notification.tpl.block.user_link"] ." ". $notification->getAuthorLabel();
472-
$node->event_description_long = $notification->getDescriptionLong(true);
474+
$node->event_description_long = strip_tags($notification->getDescriptionLong(true));
473475
$node->event_date = StatHelper::relativeDate($notification->getDate(), $mess);
474476
$node->event_type = "alert";
475477
$node->alert_id = $notification->alert_id;

‎core/src/plugins/core.notifications/class.NotificationLoader.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -338,7 +338,8 @@ Class.create("NotificationLoader", {
338338
"columnsDef":[
339339
{"attributeName":"ajxp_label", "messageId":1, "sortType":"String"},
340340
{"attributeName":"event_time", "messageString":"Time", "sortType":"Number"},
341-
{"attributeName":"event_type", "messageString":"Type", "sortType":"String"}],
341+
{"attributeName":"event_description", "messageString":"Description", "sortType":"String"}
342+
],
342343
"silentLoading":true,
343344
"fixedSortColumn":"event_time",
344345
"fixedSortDirection":"desc",

‎core/src/plugins/gui.ajax/res/themes/orbit/css/allz.css

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎core/src/plugins/gui.ajax/res/themes/orbit/css/components/infopanel.less

Lines changed: 26 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
@infopanel_values_color:#555;
77
@infopanel_quick_button_border:1px dotted #999;
88

9-
@infopanel_fetchedpane_text_color: #222;
9+
@infopanel_fetchedpane_text_color: #666;
1010
@infopanel_fetchedpane_legend_color: #666;
1111

1212
@infopanel_toolbar_buttons_radius:0;
@@ -119,27 +119,47 @@
119119

120120
div.class-FetchedResultPane{
121121

122-
font-size: 13px;
123122
div.thumbnail_selectable_cell.detailed{
124-
padding: 0;
123+
padding: 0 0 16px;
125124
cursor: default;
126125
div.thumbnail_selectable_cell{
127126
display: none;
128127
}
129128
div.thumbLabel{
130-
font-size: 1.1em;
129+
font-size: 15px;
131130
color: @infopanel_fetchedpane_text_color;
132131
white-space: normal;
133-
line-height: 1.5em;
134132
padding-top: 0;
135-
padding-bottom: 8px;
133+
font-weight: 400;
136134
small {
137135
color: @infopanel_fetchedpane_legend_color;
138136
display: block;
139137
font-size: 0.8em;
140138
line-height: 15px;
141139
}
142140
}
141+
div.thumbnail_cell_metadata{
142+
display: block;
143+
opacity: 0.9;
144+
.metadata_chunk.metadata_chunk_description{
145+
font-size: 12px;
146+
opacity: 1 !important;
147+
color: @infopanel_fetchedpane_legend_color !important;
148+
white-space: normal;
149+
}
150+
.metadata_chunk.metadata_chunk_standard{
151+
display: none;
152+
}
153+
}
154+
&.selected-focus{
155+
div.thumbnail_cell_metadata{
156+
opacity: 0.9;
157+
}
158+
div.thumbLabel{
159+
color: @infopanel_fetchedpane_text_color;
160+
font-weight: 400;
161+
}
162+
}
143163
}
144164
&.leaf_activity div.thumbnail_selectable_cell.detailed div.thumbLabel
145165
{

‎core/src/plugins/gui.ajax/res/themes/orbit/css/pydio.css

Lines changed: 29 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -5229,13 +5229,9 @@ div.menu.rootDirChooser span.rootDirTitle {
52295229
.form-ip_content_info_panel div.folded_icons {
52305230
display: none;
52315231
}
5232-
#info_panel div.class-FetchedResultPane,
5233-
.form-ip_content_info_panel div.class-FetchedResultPane {
5234-
font-size: 13px;
5235-
}
52365232
#info_panel div.class-FetchedResultPane div.thumbnail_selectable_cell.detailed,
52375233
.form-ip_content_info_panel div.class-FetchedResultPane div.thumbnail_selectable_cell.detailed {
5238-
padding: 0;
5234+
padding: 0 0 16px;
52395235
cursor: default;
52405236
}
52415237
#info_panel div.class-FetchedResultPane div.thumbnail_selectable_cell.detailed div.thumbnail_selectable_cell,
@@ -5244,12 +5240,11 @@ div.menu.rootDirChooser span.rootDirTitle {
52445240
}
52455241
#info_panel div.class-FetchedResultPane div.thumbnail_selectable_cell.detailed div.thumbLabel,
52465242
.form-ip_content_info_panel div.class-FetchedResultPane div.thumbnail_selectable_cell.detailed div.thumbLabel {
5247-
font-size: 1.1em;
5248-
color: #222222;
5243+
font-size: 15px;
5244+
color: #666666;
52495245
white-space: normal;
5250-
line-height: 1.5em;
52515246
padding-top: 0;
5252-
padding-bottom: 8px;
5247+
font-weight: 400;
52535248
}
52545249
#info_panel div.class-FetchedResultPane div.thumbnail_selectable_cell.detailed div.thumbLabel small,
52555250
.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 {
52585253
font-size: 0.8em;
52595254
line-height: 15px;
52605255
}
5256+
#info_panel div.class-FetchedResultPane div.thumbnail_selectable_cell.detailed div.thumbnail_cell_metadata,
5257+
.form-ip_content_info_panel div.class-FetchedResultPane div.thumbnail_selectable_cell.detailed div.thumbnail_cell_metadata {
5258+
display: block;
5259+
opacity: 0.9;
5260+
}
5261+
#info_panel div.class-FetchedResultPane div.thumbnail_selectable_cell.detailed div.thumbnail_cell_metadata .metadata_chunk.metadata_chunk_description,
5262+
.form-ip_content_info_panel div.class-FetchedResultPane div.thumbnail_selectable_cell.detailed div.thumbnail_cell_metadata .metadata_chunk.metadata_chunk_description {
5263+
font-size: 12px;
5264+
opacity: 1 !important;
5265+
color: #666666 !important;
5266+
white-space: normal;
5267+
}
5268+
#info_panel div.class-FetchedResultPane div.thumbnail_selectable_cell.detailed div.thumbnail_cell_metadata .metadata_chunk.metadata_chunk_standard,
5269+
.form-ip_content_info_panel div.class-FetchedResultPane div.thumbnail_selectable_cell.detailed div.thumbnail_cell_metadata .metadata_chunk.metadata_chunk_standard {
5270+
display: none;
5271+
}
5272+
#info_panel div.class-FetchedResultPane div.thumbnail_selectable_cell.detailed.selected-focus div.thumbnail_cell_metadata,
5273+
.form-ip_content_info_panel div.class-FetchedResultPane div.thumbnail_selectable_cell.detailed.selected-focus div.thumbnail_cell_metadata {
5274+
opacity: 0.9;
5275+
}
5276+
#info_panel div.class-FetchedResultPane div.thumbnail_selectable_cell.detailed.selected-focus div.thumbLabel,
5277+
.form-ip_content_info_panel div.class-FetchedResultPane div.thumbnail_selectable_cell.detailed.selected-focus div.thumbLabel {
5278+
color: #666666;
5279+
font-weight: 400;
5280+
}
52615281
#info_panel div.class-FetchedResultPane.leaf_activity div.thumbnail_selectable_cell.detailed div.thumbLabel,
52625282
.form-ip_content_info_panel div.class-FetchedResultPane.leaf_activity div.thumbnail_selectable_cell.detailed div.thumbLabel {
52635283
color: #555555;

‎core/src/plugins/gui.ajax/res/themes/orbit/css/theme/variables.less

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -229,7 +229,7 @@
229229
@infopanel_quick_button_border:1px dotted #999;
230230
@infopanel_section_title_color:#333;
231231

232-
@infopanel_fetchedpane_text_color: #222;
232+
@infopanel_fetchedpane_text_color: #666;
233233
@infopanel_fetchedpane_legend_color: #666;
234234
@infopanel_share_button_tint:@colorCodeShared;
235235

0 commit comments

Comments
 (0)