Conversation
@nickvergessen can you take over? The activitysubject needs to be modified according to the tasks above. Probably split into action (change, add, rename, share, delete …), person who did the action (mostly yourself), recipient (for shares), and filename. |
Try to merge this until 12th May http://mailman.owncloud.org/pipermail/devel/2014-May/000188.html |
@nickvergessen you said you already had some of the improvements locally? Can you push them here? |
@jancborchardt the local work is based on #1685 will do, as soon as it got merged |
@nickvergessen #1685 is merged now, can we move on with the design? |
…e UI The long one is displayed on hover
Rebased and updated: .txt previews are generated with a white background, which is now displayed on white background instead of gray background as before: it's too hard to guess which date belongs to which activity when your screen is a bit bigger: |
Fixed that one.
I’d say that’s only a test-case issue for now as it only happens when you create »test« files with almost nothing in it. Normally I would add a slight border around it, but that would make filetype icons look silly. Let’s leave it.
Yeah, true. Then again, the date isn’t that important so it shouldn’t be too prominent. Will look into that later. |
|
…to activity-design # By Jan-Christoph Borchardt # Via Jan-Christoph Borchardt * 'activity-design' of https://github.com/owncloud/apps: align icons to top in activity groups change colored change icon to black/grey for less distraction
Moved to new issue owncloud/activity#2 |
Works for me |
$prepared_params[] = $param; | ||
|
||
if ($highlight_params) { | ||
$prepared_params[] = '{{beginparamhighlight}}' . $param . '{{endparamhighlight}}'; |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@LukasReschke Is this okay?
The problem is we want to print <strong>
but no other html
I see no otherway then combining it with https://github.com/owncloud/apps/pull/1769/files#diff-dffaf6a7a40b2f1ec0be834c5bf5574bR19
<?php print_unescaped(str_replace(
array('{{beginparamhighlight}}', '{{endparamhighlight}}'),
array('<strong>', '</strong>'),
OC_Util::sanitizeHTML(\OCA\Activity\Data::translation($_['event']['app'], $_['event']['subject'], $_['event']['subjectparams'], true, true))
)) ?>
Or is there a way to tell sanitizeHTML()
that <strong>
is okay?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Can't you handle the string tag in the template?
Is <strong>
the right thing to do these days? I'd expect classes to be added to tags
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
whether <strong>
or something else does not really matter.
The problem is, we need a tag an only want to allow this one tag. but still sanitize the rest of the string. Is it okay to do it like this?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Can't you handle the string tag in the template?
What about this ⬆️
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@DeepDiver1975 okay I think I fixed it better now:
404edc0
This however means that an translator could XSS by adding html to his/her translation
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This however means that an translator could XSS by adding html to his/her translation
They still can do this a lot of other places in the code ;-)
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
indeed - we currently assume translators to be nice with us 😉
This was due to a bug-fix in owncloud activities that have been created between the bug-fix and the fix in activity apps are broken forever, but this is master-only.
Looks like a key, did you share it via link with password or something?
is related to the same issue as 1. |
Folders (when shared) get a »blank page« filetype icon as preview instead of a folder |
@nickvergessen I would say we should fix the preview stuff (with the folders) and then merge this. Everything else is for follow-up pull requests. cc @owncloud/designers for review. |
@@ -131,16 +129,20 @@ public static function send($app, $subject, $subjectparams = array(), $message = | |||
return true; | |||
} | |||
|
|||
public static function prepare_files_params($app, $text, $params, $file_position = false) | |||
{ | |||
public static function prepare_files_params($app, $text, $params, $file_position = false, $strip_path = false, $highlight_params) { |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Bääh - we use camel case! Please follow your coding guide lines!
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Sorry, will fix in a new PR
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
k
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Created an issue: owncloud/activity#4
👍 since the workaround has been approved by DeepDiver |
🚧
@nickvergessen let’s use this for working on the Activity app design. Essentially we should move to an easier to read list view. Here’s a basic mockup of how it should look:
owncloud activity app mockup
That’s basically it. What do you think?
Open bugs:
Fixes #1676