Misc changes

diff --git a/CREDITS.txt b/CREDITS.txt
index 85e71bd18a5b9394985303b4dcc7cb5e2ac1e365..56f86cefd18288800e1cce572a13f8caceb341bc 100644 (file)
--- a/CREDITS.txt
+++ b/CREDITS.txt
@@ -19,3 +19,4 @@ http://www.openclipart.org/detail/107473/folder-inbox-by-anonymous
 http://www.openclipart.org/detail/160369/eshop-by-lbear
 http://www.openclipart.org/detail/110/red-square-error-warning-icon-by-molumen
 http://www.openclipart.org/detail/57745/denied-by-chovynz
+http://www.openclipart.org/detail/10940/red-+-green-ok-not-ok-icons-by-tzeeniewheenie-10940

diff --git a/features/muamba_system/muamba_system.features.field.inc b/features/muamba_system/muamba_system.features.field.inc
index 39a2cb29e08fb87302ea1621c7a12821db105bde..98dffb8e134aab1679ecb9e6dcf86664ba89014d 100644 (file)
--- a/features/muamba_system/muamba_system.features.field.inc
+++ b/features/muamba_system/muamba_system.features.field.inc
@@ -234,7 +234,7 @@ function muamba_system_field_default_fields() {
       'description' => 'Logotipo do clube',
       'display' => array(
         'default' => array(
-          'label' => 'above',
+          'label' => 'hidden',
           'module' => 'image',
           'settings' => array(
             'image_link' => '',
@@ -474,7 +474,7 @@ function muamba_system_field_default_fields() {
       'description' => '',
       'display' => array(
         'default' => array(
-          'label' => 'above',
+          'label' => 'hidden',
           'module' => 'image',
           'settings' => array(
             'image_link' => '',
@@ -512,7 +512,7 @@ function muamba_system_field_default_fields() {
           'progress_indicator' => 'throbber',
         ),
         'type' => 'image_image',
-        'weight' => '2',
+        'weight' => '1',
       ),
     ),
   );
@@ -566,8 +566,8 @@ function muamba_system_field_default_fields() {
       ),
       'entity_type' => 'node',
       'field_name' => 'group_audience',
-      'label' => 'Groups audience',
-      'required' => FALSE,
+      'label' => 'Grupos',
+      'required' => 1,
       'settings' => array(
         'user_register_form' => FALSE,
       ),
@@ -584,12 +584,13 @@ function muamba_system_field_default_fields() {
         ),
       ),
       'widget' => array(
+        'active' => 1,
         'module' => 'og',
         'settings' => array(
           'opt_group' => 'auto',
         ),
         'type' => 'group_audience',
-        'weight' => '4',
+        'weight' => '3',
       ),
       'widget_type' => 'group_audience',
     ),
@@ -626,7 +627,7 @@ function muamba_system_field_default_fields() {
       'bundle' => 'muamba',
       'default_value' => array(
         0 => array(
-          'value' => 0,
+          'value' => '0',
         ),
       ),
       'deleted' => '0',
@@ -648,8 +649,8 @@ function muamba_system_field_default_fields() {
       ),
       'entity_type' => 'node',
       'field_name' => 'group_content_access',
-      'label' => 'Group content visibility',
-      'required' => TRUE,
+      'label' => 'Visibilidade',
+      'required' => 1,
       'settings' => array(
         'user_register_form' => FALSE,
       ),
@@ -664,10 +665,11 @@ function muamba_system_field_default_fields() {
         ),
       ),
       'widget' => array(
+        'active' => 1,
         'module' => 'options',
         'settings' => array(),
         'type' => 'options_select',
-        'weight' => '3',
+        'weight' => '2',
       ),
       'widget_type' => 'options_select',
     ),
@@ -811,14 +813,15 @@ function muamba_system_field_default_fields() {
   t('Comment');
   t('Descrição');
   t('Foto');
-  t('Group content visibility');
   t('Group type');
   t('Group visibility');
   t('Groups audience');
+  t('Grupos');
   t('Logo');
   t('Logotipo do clube');
   t('Request message');
   t('This is the text a user may send to the group administrators.');
+  t('Visibilidade');
 
   return $fields;
 }

diff --git a/images/accept.orig.png b/images/accept.orig.png
new file mode 100644 (file)
index 0000000..d5a019c
Binary files /dev/null and b/images/accept.orig.png differ

diff --git a/images/accept.png b/images/accept.png
new file mode 100644 (file)
index 0000000..c93a41f
Binary files /dev/null and b/images/accept.png differ

diff --git a/images/reject.png b/images/reject.png
new file mode 120000 (symlink)
index 0000000..8a6b758
--- /dev/null
+++ b/images/reject.png
@@ -0,0 +1 @@
+cancel.png
\ No newline at end of file

diff --git a/muamba-widget.tpl.php b/muamba-widget.tpl.php
index 6923de8db5879c62a2eff9b27b2b29dc02b9bf9f..062558b45c048df6066bf46f5184a1f71330f7b3 100644 (file)
--- a/muamba-widget.tpl.php
+++ b/muamba-widget.tpl.php
@@ -13,7 +13,8 @@ global $user;
 drupal_add_js($path  .'/muamba.js');
 drupal_add_css($path .'/muamba.css');
 
-$output  = '<div class="muamba-widget">';
+$output = '<div class="muamba-widget">';
+$output = '<h3>'. t('Options') .'</h3>';
 
 if (empty($transaction)) {
   $output .= theme('muamba_widget_icon', array('status' => MUAMBA_REQUESTED, 'id' => $nid));
@@ -24,7 +25,7 @@ elseif ($transaction['uid'] == $user->uid) {
   }
 }
 elseif ($transaction['owner'] == $user->uid) {
-  foreach (muamba_actions_available('received', $transcation['status']) as $action) {
+  foreach (muamba_actions_available('received', $transaction['status']) as $action) {
     $output .= theme('muamba_widget_icon', array('status' => $action, 'id' => $transaction['mid']));
   }
 }

diff --git a/muamba.module b/muamba.module
index b530bb90dd7b1afecf871654847a6ac5efd18fae..5552d8b459d9652793dcc09b61dc048818d9afa9 100644 (file)
--- a/muamba.module
+++ b/muamba.module
@@ -112,7 +112,7 @@ function muamba_node_view($node, $view_mode, $langcode) {
   global $user;
 
   // Check if widget can be shown
-  if ($node->uid == $user->uid || $node->type != MUAMBA_NODE_TYPE || !muamba_has_request_access($node)) {
+  if ($node->type != MUAMBA_NODE_TYPE || !muamba_has_request_access($node)) {
     return;
   }