Merge branch 'master' into develop

tuursw · Sep 17, 2013 · 05950b5 · 05950b5
2 parents 7e835f4 + de72d87
commit 05950b5
Show file tree

Hide file tree

Showing 7 changed files with 13 additions and 22 deletions.
diff --git a/culturefeed_pages/includes/pages.inc b/culturefeed_pages/includes/pages.inc
@@ -453,6 +453,10 @@ function culturefeed_pages_add_request_send(& $form, & $form_state) {
     $activity = new CultureFeed_Activity();
     $activity->nodeId = $page_id;
     $activity->nodeTitle = $form_state['values']['name'];
+    $activity->contentType = CultureFeed_Activity::CONTENT_TYPE_CULTUREFEED_PAGE;
+    $activity->type = CultureFeed_Activity::TYPE_PAGE_CREATED;
+    $activity->userId = DrupalCultureFeed::getLoggedInUserId();
+    DrupalCultureFeed::createActivity($activity);
 
     drupal_set_message(format_string(t('Page "@page" has been created.'), array('@page' => $form_state['values']['name'])));
   }

diff --git a/culturefeed_social/lib/Drupal/CultureFeedActivityConfigComment.php b/culturefeed_social/lib/Drupal/CultureFeedActivityConfigComment.php
@@ -32,7 +32,7 @@ public function __construct() {
     $this->action = t('Reply');
     $this->loginRequiredMessage = t('You must be logged in to post a comment');
     $this->onBehalfOfMessage = t('Reply as');
-    $this->pointsOverviewPrefix = t('posted a comment on');
+    $this->pointsOverviewPrefix = t('Posted a comment on');
 
   }
 

diff --git a/culturefeed_social/lib/Drupal/CultureFeedActivityConfigFacebook.php b/culturefeed_social/lib/Drupal/CultureFeedActivityConfigFacebook.php
@@ -28,7 +28,7 @@ public function __construct() {
     $this->label = t('Share on Facebook');
     $this->undoNotAllowedMessage = t('Successfully shared');
     $this->action = t('comments');
-    $this->pointsOverviewSuffix = t('shared');
+    $this->pointsOverviewSuffix = t('shared on Facebook');
 
   }
 

diff --git a/culturefeed_social/lib/Drupal/CultureFeedActivityConfigLike.php b/culturefeed_social/lib/Drupal/CultureFeedActivityConfigLike.php
@@ -32,6 +32,7 @@ public function __construct() {
     $this->viewSuffix = t('this');
     $this->label = t('Like');
     $this->loginRequiredMessage = t('You must be logged in to like this item');
+    $this->pointsOverviewSuffix = t('liked');
 
   }
 

diff --git a/culturefeed_social/lib/Drupal/CultureFeedActivityConfigReview.php b/culturefeed_social/lib/Drupal/CultureFeedActivityConfigReview.php
@@ -21,7 +21,7 @@ public function __construct() {
     $this->label = t('Reviews');
     $this->titleDo = t('Write a review');
     $this->titleDoFirst = t('Be the first to write a review');
-    $this->pointsOverviewPrefix = t('Reviews for');
+    $this->pointsOverviewPrefix = t('Wrote a review for');
 
   }
 

diff --git a/culturefeed_social/lib/Drupal/CultureFeedActivityConfigTwitter.php b/culturefeed_social/lib/Drupal/CultureFeedActivityConfigTwitter.php
@@ -27,7 +27,7 @@ public function __construct() {
     $this->viewSuffix = t('shared on Twitter');
     $this->label = t('Share on Twitter');
     $this->undoNotAllowedMessage = t('Successfully shared');
-    $this->pointsOverviewSuffix = t('shared');
+    $this->pointsOverviewSuffix = t('shared on Twitter');
 
   }
 

diff --git a/culturefeed_userpoints_ui/theme/culturefeed-userpoints-earned-overview.tpl.php b/culturefeed_userpoints_ui/theme/culturefeed-userpoints-earned-overview.tpl.php
@@ -1,27 +1,13 @@
-<p><strong><span class="lead"><?php print $total_points; ?> <?php print t('points'); ?></span></strong> <?php print $exchange_link; ?></p>
+<p><?php print t('points'); ?>: <?php print $total_points; ?> <?php print $exchange_link; ?></p>
 
-<p class="muted"><small><?php print t('As an UiTiD user, you can save points by performing actions. Points can be exchanged for one or more gifts.'); ?> <a href="#"><?php print t('More info'); ?></a></small></p>
-
-<table class="table table-striped table-hover">
-  <thead>
-    <tr>
-      <th></th>
-      <th></th>
-      <th></th>
-    </tr>
-  </thead>
+<table>
   <tbody>
     <?php foreach ($items as $item): ?>
       <tr>
-        <td class="muted"><small><?php print $item['date']; ?></small></td>
-        <td><small><strong><?php print $item['points']; ?></strong></small></td>
+        <td><?php print $item['date']; ?></td>
+        <td><?php print $item['points']; ?></td>
         <td><?php print $item['description']; ?></td>
       </tr>
     <?php endforeach; ?>  
   </tbody>
 </table>
-
-
-
-
-