diff --git a/src/app/layout/blocks/recent-activities-plugin-activities/activities/event.html b/src/app/layout/blocks/recent-activities-plugin-activities/activities/event.html new file mode 100644 index 0000000..150a869 --- /dev/null +++ b/src/app/layout/blocks/recent-activities-plugin-activities/activities/event.html @@ -0,0 +1,3 @@ + +

{{activity.params.name}}
{{activity.params.lead | stripTags}}

+
diff --git a/src/app/layout/blocks/recent-activities-plugin-activities/recent-activities-plugin-activities-block.component.ts b/src/app/layout/blocks/recent-activities-plugin-activities/recent-activities-plugin-activities-block.component.ts index 4450af3..a81c1e8 100644 --- a/src/app/layout/blocks/recent-activities-plugin-activities/recent-activities-plugin-activities-block.component.ts +++ b/src/app/layout/blocks/recent-activities-plugin-activities/recent-activities-plugin-activities-block.component.ts @@ -18,7 +18,12 @@ export class RecentActivitiesPluginActivitiesBlockComponent { constructor(private blockService: BlockService, private $state: any) { } getActivityTemplate(activity: any) { - return 'app/layout/blocks/recent-activities-plugin-activities/activities/' + activity.verb + '.html'; + if (activity.label === 'events') { + return 'app/layout/blocks/recent-activities-plugin-activities/activities/event.html'; + } + else { + return 'app/layout/blocks/recent-activities-plugin-activities/activities/' + activity.verb + '.html'; + } } urlFor(params: any) { diff --git a/src/app/layout/blocks/recent-activities-plugin-activities/recent-activities-plugin-activities-block.html b/src/app/layout/blocks/recent-activities-plugin-activities/recent-activities-plugin-activities-block.html index b9a1500..9b0e5a3 100644 --- a/src/app/layout/blocks/recent-activities-plugin-activities/recent-activities-plugin-activities-block.html +++ b/src/app/layout/blocks/recent-activities-plugin-activities/recent-activities-plugin-activities-block.html @@ -1,14 +1,22 @@
+ +
+

+ {{ 'activities.event.description' | translate }} {{ activity.start_date | date:longDate }} {{ 'time.at' | translate }} {{ activity.start_date | date:'HH:mm' }} - {{activity.user.name}} {{activity.label}} +

+ +

+ {{ 'date.on' | translate }} {{ activity.created_at | date:longDate }} {{ 'time.at' | translate }} {{ activity.created_at | date:'HH:mm' }} - {{activity.user.name}} {{activity.label}} +

+
+ -
- - - -
+ +
diff --git a/src/app/layout/blocks/recent-activities-plugin-activities/recent-activities-plugin-activities-block.scss b/src/app/layout/blocks/recent-activities-plugin-activities/recent-activities-plugin-activities-block.scss index fec8e8b..9fcf3cb 100644 --- a/src/app/layout/blocks/recent-activities-plugin-activities/recent-activities-plugin-activities-block.scss +++ b/src/app/layout/blocks/recent-activities-plugin-activities/recent-activities-plugin-activities-block.scss @@ -20,4 +20,53 @@ display: none; } } + + .panel { + margin-bottom: 15px; + box-shadow: none; + border-radius: 0; + } + + h5 { + text-transform: capitalize; + } + + .subheader { + p { + margin: 2px 0; + font-size: 11px; + } + } + + hr { + border: 0; + height: 1px; + background: #ccc; + margin: 0; + margin-top: 15px; + } + + .activity-label { + @include border-radius(2px); + font-size: 11px; + text-transform: capitalize; + background: #333; + color: #fff; + padding: 2px; + margin-left: 5px; + display: inline-block; + } + + .event-image { + width: 15%; + height: auto; + float: left; + } + + .event-description { + width: 83%; + margin: 2px 0 0 2px; + float: left; + display: block; + } } diff --git a/src/languages/en.json b/src/languages/en.json index ec23074..6e62366 100644 --- a/src/languages/en.json +++ b/src/languages/en.json @@ -97,5 +97,8 @@ "block.edition.display_user.all": "All users", "block.edition.display_user.logged": "Logged", "block.edition.display_user.not_logged": "Not logged", - "block.edition.language.label": "Show for:" + "block.edition.language.label": "Show for:", + "activities.event.description": "Event on", + "time.at": "at", + "date.on": "On" } diff --git a/src/languages/pt.json b/src/languages/pt.json index 02f7c95..3845dda 100644 --- a/src/languages/pt.json +++ b/src/languages/pt.json @@ -97,5 +97,8 @@ "block.edition.display_user.all": "Todos os usuários", "block.edition.display_user.logged": "Logados", "block.edition.display_user.not_logged": "Não logados", - "block.edition.language.label": "Exibir para:" + "block.edition.language.label": "Exibir para:", + "activities.event.description": "Evento em", + "time.at": "às", + "date.on": "Em" } -- libgit2 0.21.2