Updating interface

diff --git a/features/muamba_interface/muamba_interface.pages_default.inc b/features/muamba_interface/muamba_interface.pages_default.inc
index f52b56c3200af7e1014f23ded420e19b4838fdff..58c0486077b040a8563ff1ca3da062837fe8dc88 100644 (file)
--- a/features/muamba_interface/muamba_interface.pages_default.inc
+++ b/features/muamba_interface/muamba_interface.pages_default.inc
@@ -201,25 +201,26 @@ function muamba_interface_default_page_manager_pages() {
     $pane = new stdClass;
     $pane->pid = 'new-1';
     $pane->panel = 'middle';
-    $pane->type = 'views';
-    $pane->subtype = 'transacoes';
+    $pane->type = 'block';
+    $pane->subtype = 'search-form';
     $pane->shown = TRUE;
-    $pane->access = array();
+    $pane->access = array(
+      'plugins' => array(
+        0 => array(
+          'name' => 'role',
+          'settings' => array(
+            'rids' => array(
+              0 => 2,
+            ),
+          ),
+          'context' => 'logged-in-user',
+          'not' => FALSE,
+        ),
+      ),
+    );
     $pane->configuration = array(
-      'override_pager_settings' => 0,
-      'use_pager' => 1,
-      'nodes_per_page' => '10',
-      'pager_id' => '0',
-      'offset' => '0',
-      'more_link' => 0,
-      'feed_icons' => 0,
-      'panel_args' => 0,
-      'link_to_view' => 0,
-      'args' => '',
-      'url' => '',
-      'display' => 'block_3',
       'override_title' => 1,
-      'override_title_text' => 'Histórico',
+      'override_title_text' => 'Busca',
     );
     $pane->cache = array();
     $pane->style = array(
@@ -234,7 +235,7 @@ function muamba_interface_default_page_manager_pages() {
     $pane->pid = 'new-2';
     $pane->panel = 'middle';
     $pane->type = 'views';
-    $pane->subtype = 'og_list';
+    $pane->subtype = 'og_user_groups';
     $pane->shown = TRUE;
     $pane->access = array(
       'plugins' => array(
@@ -242,7 +243,7 @@ function muamba_interface_default_page_manager_pages() {
           'name' => 'role',
           'settings' => array(
             'rids' => array(
-              0 => 1,
+              0 => 2,
             ),
           ),
           'context' => 'logged-in-user',
@@ -262,9 +263,9 @@ function muamba_interface_default_page_manager_pages() {
       'link_to_view' => 0,
       'args' => '',
       'url' => '',
-      'display' => 'page_2',
+      'display' => 'page_1',
       'override_title' => 1,
-      'override_title_text' => 'Grupos',
+      'override_title_text' => 'Meus grupos',
     );
     $pane->cache = array();
     $pane->style = array(
@@ -311,26 +312,13 @@ function muamba_interface_default_page_manager_pages() {
     $pane->pid = 'new-4';
     $pane->panel = 'middle';
     $pane->type = 'views';
-    $pane->subtype = 'og_user_groups';
+    $pane->subtype = 'transacoes';
     $pane->shown = TRUE;
-    $pane->access = array(
-      'plugins' => array(
-        0 => array(
-          'name' => 'role',
-          'settings' => array(
-            'rids' => array(
-              0 => 2,
-            ),
-          ),
-          'context' => 'logged-in-user',
-          'not' => FALSE,
-        ),
-      ),
-    );
+    $pane->access = array();
     $pane->configuration = array(
       'override_pager_settings' => 0,
       'use_pager' => 1,
-      'nodes_per_page' => '0',
+      'nodes_per_page' => '10',
       'pager_id' => '0',
       'offset' => '0',
       'more_link' => 0,
@@ -339,9 +327,9 @@ function muamba_interface_default_page_manager_pages() {
       'link_to_view' => 0,
       'args' => '',
       'url' => '',
-      'display' => 'page_1',
+      'display' => 'block_3',
       'override_title' => 1,
-      'override_title_text' => 'Meus grupos',
+      'override_title_text' => 'Histórico',
     );
     $pane->cache = array();
     $pane->style = array(
@@ -388,13 +376,13 @@ function muamba_interface_default_page_manager_pages() {
     $pane->pid = 'new-6';
     $pane->panel = 'middle';
     $pane->type = 'views';
-    $pane->subtype = 'transacoes';
+    $pane->subtype = 'muambas';
     $pane->shown = TRUE;
     $pane->access = array();
     $pane->configuration = array(
       'override_pager_settings' => 0,
       'use_pager' => 1,
-      'nodes_per_page' => '10',
+      'nodes_per_page' => '5',
       'pager_id' => '0',
       'offset' => '0',
       'more_link' => 0,
@@ -403,9 +391,9 @@ function muamba_interface_default_page_manager_pages() {
       'link_to_view' => 0,
       'args' => '',
       'url' => '',
-      'display' => 'block_2',
+      'display' => 'block_4',
       'override_title' => 1,
-      'override_title_text' => 'Me pediram',
+      'override_title_text' => 'Emprestei',
     );
     $pane->cache = array();
     $pane->style = array(
@@ -435,9 +423,9 @@ function muamba_interface_default_page_manager_pages() {
       'link_to_view' => 0,
       'args' => '',
       'url' => '',
-      'display' => 'block_1',
+      'display' => 'block_2',
       'override_title' => 1,
-      'override_title_text' => 'Meus pedidos',
+      'override_title_text' => 'Me pediram',
     );
     $pane->cache = array();
     $pane->style = array(
@@ -448,8 +436,117 @@ function muamba_interface_default_page_manager_pages() {
     $pane->position = 6;
     $display->content['new-7'] = $pane;
     $display->panels['middle'][6] = 'new-7';
+    $pane = new stdClass;
+    $pane->pid = 'new-8';
+    $pane->panel = 'middle';
+    $pane->type = 'views';
+    $pane->subtype = 'transacoes';
+    $pane->shown = TRUE;
+    $pane->access = array();
+    $pane->configuration = array(
+      'override_pager_settings' => 0,
+      'use_pager' => 1,
+      'nodes_per_page' => '10',
+      'pager_id' => '0',
+      'offset' => '0',
+      'more_link' => 0,
+      'feed_icons' => 0,
+      'panel_args' => 0,
+      'link_to_view' => 0,
+      'args' => '',
+      'url' => '',
+      'display' => 'block_1',
+      'override_title' => 1,
+      'override_title_text' => 'Meus pedidos',
+    );
+    $pane->cache = array();
+    $pane->style = array(
+      'settings' => NULL,
+    );
+    $pane->css = array();
+    $pane->extras = array();
+    $pane->position = 7;
+    $display->content['new-8'] = $pane;
+    $display->panels['middle'][7] = 'new-8';
+    $pane = new stdClass;
+    $pane->pid = 'new-9';
+    $pane->panel = 'middle';
+    $pane->type = 'views';
+    $pane->subtype = 'muambas';
+    $pane->shown = TRUE;
+    $pane->access = array();
+    $pane->configuration = array(
+      'override_pager_settings' => 0,
+      'use_pager' => 1,
+      'nodes_per_page' => '5',
+      'pager_id' => '0',
+      'offset' => '0',
+      'more_link' => 0,
+      'feed_icons' => 0,
+      'panel_args' => 0,
+      'link_to_view' => 0,
+      'args' => '',
+      'url' => '',
+      'display' => 'block_5',
+      'override_title' => 1,
+      'override_title_text' => 'Peguei',
+    );
+    $pane->cache = array();
+    $pane->style = array(
+      'settings' => NULL,
+    );
+    $pane->css = array();
+    $pane->extras = array();
+    $pane->position = 8;
+    $display->content['new-9'] = $pane;
+    $display->panels['middle'][8] = 'new-9';
+    $pane = new stdClass;
+    $pane->pid = 'new-10';
+    $pane->panel = 'middle';
+    $pane->type = 'views';
+    $pane->subtype = 'og_list';
+    $pane->shown = TRUE;
+    $pane->access = array(
+      'plugins' => array(
+        0 => array(
+          'name' => 'role',
+          'settings' => array(
+            'rids' => array(
+              0 => 1,
+            ),
+          ),
+          'context' => 'logged-in-user',
+          'not' => FALSE,
+        ),
+      ),
+    );
+    $pane->configuration = array(
+      'override_pager_settings' => 0,
+      'use_pager' => 1,
+      'nodes_per_page' => '0',
+      'pager_id' => '0',
+      'offset' => '0',
+      'more_link' => 0,
+      'feed_icons' => 0,
+      'panel_args' => 0,
+      'link_to_view' => 0,
+      'args' => '',
+      'url' => '',
+      'display' => 'page_2',
+      'override_title' => 1,
+      'override_title_text' => 'Grupos',
+    );
+    $pane->cache = array();
+    $pane->style = array(
+      'settings' => NULL,
+    );
+    $pane->css = array();
+    $pane->extras = array();
+    $pane->position = 9;
+    $display->content['new-10'] = $pane;
+    $display->panels['middle'][9] = 'new-10';
   $display->hide_title = PANELS_TITLE_FIXED;
-  $display->title_pane = 'new-7';
+  $display->title_pane = 'new-8';
   $handler->conf['display'] = $display;
   $page->default_handlers[$handler->name] = $handler;
   $pages['principal'] = $page;

diff --git a/features/muamba_interface/muamba_interface.views_default.inc b/features/muamba_interface/muamba_interface.views_default.inc
index cacdacaea1883522df746a8a1f4911e056889d98..9de7facc2fb0678a6c729fcc69b4e1a432690fb3 100644 (file)
--- a/features/muamba_interface/muamba_interface.views_default.inc
+++ b/features/muamba_interface/muamba_interface.views_default.inc
@@ -25,6 +25,7 @@ function muamba_interface_views_default_views() {
   $handler->display->display_options['title'] = 'Minhas muambas';
   $handler->display->display_options['use_ajax'] = TRUE;
   $handler->display->display_options['use_more_text'] = 'mais';
+  $handler->display->display_options['link_display'] = 'page_1';
   $handler->display->display_options['access']['type'] = 'role';
   $handler->display->display_options['access']['role'] = array(
     2 => '2',
@@ -130,6 +131,7 @@ function muamba_interface_views_default_views() {
   $handler->display->display_options['filters']['status_1']['id'] = 'status_1';
   $handler->display->display_options['filters']['status_1']['table'] = 'muamba';
   $handler->display->display_options['filters']['status_1']['field'] = 'status';
+  $handler->display->display_options['filters']['status_1']['operator'] = 'empty';
 
   /* Display: Minhas */
   $handler = $view->new_display('page', 'Minhas', 'page');
@@ -177,13 +179,16 @@ function muamba_interface_views_default_views() {
   $handler->display->display_options['filters']['status_2']['field'] = 'status';
   $handler->display->display_options['filters']['status_2']['operator'] = 'empty';
   $handler->display->display_options['filters']['status_2']['group'] = 1;
-  $handler->display->display_options['path'] = 'muambas';
+  $handler->display->display_options['path'] = 'minhas';
 
   /* Display: Minhas (bloco) */
   $handler = $view->new_display('block', 'Minhas (bloco)', 'block');
   $handler->display->display_options['defaults']['title'] = FALSE;
   $handler->display->display_options['title'] = 'Minhas muambas';
   $handler->display->display_options['display_description'] = 'Minhas muambas (bloco)';
+  $handler->display->display_options['defaults']['use_more'] = FALSE;
+  $handler->display->display_options['use_more'] = TRUE;
+  $handler->display->display_options['use_more_text'] = 'mais';
   $handler->display->display_options['defaults']['pager'] = FALSE;
   $handler->display->display_options['pager']['type'] = 'full';
   $handler->display->display_options['pager']['options']['items_per_page'] = '5';
@@ -240,11 +245,155 @@ function muamba_interface_views_default_views() {
   $handler->display->display_options['filters']['status_2']['operator'] = 'empty';
   $handler->display->display_options['filters']['status_2']['group'] = 1;
 
+  /* Display: Disponíveis */
+  $handler = $view->new_display('page', 'Disponíveis', 'page_1');
+  $handler->display->display_options['defaults']['title'] = FALSE;
+  $handler->display->display_options['title'] = 'Muambas disponíveis';
+  $handler->display->display_options['display_description'] = 'Muambas disponíveis';
+  $handler->display->display_options['defaults']['relationships'] = FALSE;
+  /* Relação: Conteúdo: Autor */
+  $handler->display->display_options['relationships']['uid']['id'] = 'uid';
+  $handler->display->display_options['relationships']['uid']['table'] = 'node';
+  $handler->display->display_options['relationships']['uid']['field'] = 'uid';
+  $handler->display->display_options['relationships']['uid']['required'] = 1;
+  /* Relação: Muamba: Muamba node asset */
+  $handler->display->display_options['relationships']['nid']['id'] = 'nid';
+  $handler->display->display_options['relationships']['nid']['table'] = 'muamba';
+  $handler->display->display_options['relationships']['nid']['field'] = 'nid';
+  $handler->display->display_options['relationships']['nid']['required'] = 0;
+  /* Relação: Flags: bookmarks */
+  $handler->display->display_options['relationships']['flag_content_rel']['id'] = 'flag_content_rel';
+  $handler->display->display_options['relationships']['flag_content_rel']['table'] = 'node';
+  $handler->display->display_options['relationships']['flag_content_rel']['field'] = 'flag_content_rel';
+  $handler->display->display_options['relationships']['flag_content_rel']['required'] = 0;
+  $handler->display->display_options['relationships']['flag_content_rel']['flag'] = 'bookmarks';
+  $handler->display->display_options['defaults']['fields'] = FALSE;
+  /* Campo: Conteúdo: Foto */
+  $handler->display->display_options['fields']['field_foto']['id'] = 'field_foto';
+  $handler->display->display_options['fields']['field_foto']['table'] = 'field_data_field_foto';
+  $handler->display->display_options['fields']['field_foto']['field'] = 'field_foto';
+  $handler->display->display_options['fields']['field_foto']['label'] = '';
+  $handler->display->display_options['fields']['field_foto']['alter']['alter_text'] = 0;
+  $handler->display->display_options['fields']['field_foto']['alter']['make_link'] = 0;
+  $handler->display->display_options['fields']['field_foto']['alter']['absolute'] = 0;
+  $handler->display->display_options['fields']['field_foto']['alter']['external'] = 0;
+  $handler->display->display_options['fields']['field_foto']['alter']['replace_spaces'] = 0;
+  $handler->display->display_options['fields']['field_foto']['alter']['trim_whitespace'] = 0;
+  $handler->display->display_options['fields']['field_foto']['alter']['nl2br'] = 0;
+  $handler->display->display_options['fields']['field_foto']['alter']['word_boundary'] = 1;
+  $handler->display->display_options['fields']['field_foto']['alter']['ellipsis'] = 1;
+  $handler->display->display_options['fields']['field_foto']['alter']['strip_tags'] = 0;
+  $handler->display->display_options['fields']['field_foto']['alter']['trim'] = 0;
+  $handler->display->display_options['fields']['field_foto']['alter']['html'] = 0;
+  $handler->display->display_options['fields']['field_foto']['element_label_colon'] = FALSE;
+  $handler->display->display_options['fields']['field_foto']['element_default_classes'] = 1;
+  $handler->display->display_options['fields']['field_foto']['hide_empty'] = 0;
+  $handler->display->display_options['fields']['field_foto']['empty_zero'] = 0;
+  $handler->display->display_options['fields']['field_foto']['hide_alter_empty'] = 0;
+  $handler->display->display_options['fields']['field_foto']['click_sort_column'] = 'fid';
+  $handler->display->display_options['fields']['field_foto']['settings'] = array(
+    'image_style' => 'thumbnail',
+    'image_link' => 'content',
+  );
+  $handler->display->display_options['fields']['field_foto']['group_rows'] = 1;
+  $handler->display->display_options['fields']['field_foto']['delta_offset'] = '0';
+  $handler->display->display_options['fields']['field_foto']['delta_reversed'] = 0;
+  $handler->display->display_options['fields']['field_foto']['field_api_classes'] = 0;
+  /* Campo: Conteúdo: Título */
+  $handler->display->display_options['fields']['title']['id'] = 'title';
+  $handler->display->display_options['fields']['title']['table'] = 'node';
+  $handler->display->display_options['fields']['title']['field'] = 'title';
+  $handler->display->display_options['fields']['title']['label'] = '';
+  $handler->display->display_options['fields']['title']['alter']['alter_text'] = 0;
+  $handler->display->display_options['fields']['title']['alter']['make_link'] = 0;
+  $handler->display->display_options['fields']['title']['alter']['absolute'] = 0;
+  $handler->display->display_options['fields']['title']['alter']['word_boundary'] = 0;
+  $handler->display->display_options['fields']['title']['alter']['ellipsis'] = 0;
+  $handler->display->display_options['fields']['title']['alter']['strip_tags'] = 0;
+  $handler->display->display_options['fields']['title']['alter']['trim'] = 0;
+  $handler->display->display_options['fields']['title']['alter']['html'] = 0;
+  $handler->display->display_options['fields']['title']['hide_empty'] = 0;
+  $handler->display->display_options['fields']['title']['empty_zero'] = 0;
+  $handler->display->display_options['fields']['title']['link_to_node'] = 1;
+  /* Campo: Flags: Flag link */
+  $handler->display->display_options['fields']['ops']['id'] = 'ops';
+  $handler->display->display_options['fields']['ops']['table'] = 'flag_content';
+  $handler->display->display_options['fields']['ops']['field'] = 'ops';
+  $handler->display->display_options['fields']['ops']['relationship'] = 'flag_content_rel';
+  $handler->display->display_options['fields']['ops']['label'] = '';
+  $handler->display->display_options['fields']['ops']['alter']['alter_text'] = 0;
+  $handler->display->display_options['fields']['ops']['alter']['make_link'] = 0;
+  $handler->display->display_options['fields']['ops']['alter']['absolute'] = 0;
+  $handler->display->display_options['fields']['ops']['alter']['external'] = 0;
+  $handler->display->display_options['fields']['ops']['alter']['replace_spaces'] = 0;
+  $handler->display->display_options['fields']['ops']['alter']['trim_whitespace'] = 0;
+  $handler->display->display_options['fields']['ops']['alter']['nl2br'] = 0;
+  $handler->display->display_options['fields']['ops']['alter']['word_boundary'] = 1;
+  $handler->display->display_options['fields']['ops']['alter']['ellipsis'] = 1;
+  $handler->display->display_options['fields']['ops']['alter']['strip_tags'] = 0;
+  $handler->display->display_options['fields']['ops']['alter']['trim'] = 0;
+  $handler->display->display_options['fields']['ops']['alter']['html'] = 0;
+  $handler->display->display_options['fields']['ops']['element_label_colon'] = FALSE;
+  $handler->display->display_options['fields']['ops']['element_default_classes'] = 1;
+  $handler->display->display_options['fields']['ops']['hide_empty'] = 0;
+  $handler->display->display_options['fields']['ops']['empty_zero'] = 0;
+  $handler->display->display_options['fields']['ops']['hide_alter_empty'] = 0;
+  $handler->display->display_options['fields']['ops']['link_type'] = 'toggle';
+  $handler->display->display_options['filter_groups']['groups'] = array(
+    0 => 'AND',
+    1 => 'OR',
+  );
+  $handler->display->display_options['defaults']['filters'] = FALSE;
+  /* Filter criterion: Conteúdo: Publicado */
+  $handler->display->display_options['filters']['status']['id'] = 'status';
+  $handler->display->display_options['filters']['status']['table'] = 'node';
+  $handler->display->display_options['filters']['status']['field'] = 'status';
+  $handler->display->display_options['filters']['status']['value'] = 1;
+  $handler->display->display_options['filters']['status']['group'] = 0;
+  $handler->display->display_options['filters']['status']['expose']['operator'] = FALSE;
+  /* Filter criterion: Conteúdo: Tipo */
+  $handler->display->display_options['filters']['type']['id'] = 'type';
+  $handler->display->display_options['filters']['type']['table'] = 'node';
+  $handler->display->display_options['filters']['type']['field'] = 'type';
+  $handler->display->display_options['filters']['type']['value'] = array(
+    'muamba' => 'muamba',
+  );
+  $handler->display->display_options['filters']['type']['group'] = 0;
+  /* Filter criterion: Usuário: Atual */
+  $handler->display->display_options['filters']['uid_current']['id'] = 'uid_current';
+  $handler->display->display_options['filters']['uid_current']['table'] = 'users';
+  $handler->display->display_options['filters']['uid_current']['field'] = 'uid_current';
+  $handler->display->display_options['filters']['uid_current']['relationship'] = 'uid';
+  $handler->display->display_options['filters']['uid_current']['value'] = '0';
+  $handler->display->display_options['filters']['uid_current']['group'] = 0;
+  /* Filter criterion: Muamba: Status */
+  $handler->display->display_options['filters']['status_1']['id'] = 'status_1';
+  $handler->display->display_options['filters']['status_1']['table'] = 'muamba';
+  $handler->display->display_options['filters']['status_1']['field'] = 'status';
+  $handler->display->display_options['filters']['status_1']['operator'] = 'empty';
+  $handler->display->display_options['filters']['status_1']['group'] = 1;
+  /* Filter criterion: Muamba: Status */
+  $handler->display->display_options['filters']['status_2']['id'] = 'status_2';
+  $handler->display->display_options['filters']['status_2']['table'] = 'muamba';
+  $handler->display->display_options['filters']['status_2']['field'] = 'status';
+  $handler->display->display_options['filters']['status_2']['operator'] = 'not in';
+  $handler->display->display_options['filters']['status_2']['value'] = array(
+    0 => '0',
+    1 => '1',
+    4 => '4',
+    6 => '6',
+  );
+  $handler->display->display_options['filters']['status_2']['group'] = 1;
+  $handler->display->display_options['path'] = 'disponiveis';
+
   /* Display: Disponíveis (bloco) */
   $handler = $view->new_display('block', 'Disponíveis (bloco)', 'block_1');
   $handler->display->display_options['defaults']['title'] = FALSE;
   $handler->display->display_options['title'] = 'Muambas disponíveis';
   $handler->display->display_options['display_description'] = 'Muambas disponíveis (bloco)';
+  $handler->display->display_options['defaults']['use_more'] = FALSE;
+  $handler->display->display_options['use_more'] = TRUE;
+  $handler->display->display_options['use_more_text'] = 'mais';
   $handler->display->display_options['defaults']['pager'] = FALSE;
   $handler->display->display_options['pager']['type'] = 'full';
   $handler->display->display_options['pager']['options']['items_per_page'] = '5';
@@ -393,11 +542,63 @@ function muamba_interface_views_default_views() {
   );
   $handler->display->display_options['filters']['status_2']['group'] = 1;
 
-  /* Display: Todas (bloco) */
-  $handler = $view->new_display('block', 'Todas (bloco)', 'block_2');
+  /* Display: Emprestei (bloco) */
+  $handler = $view->new_display('block', 'Emprestei (bloco)', 'block_4');
   $handler->display->display_options['defaults']['title'] = FALSE;
-  $handler->display->display_options['title'] = 'Todas as muambas';
-  $handler->display->display_options['display_description'] = 'Todas as muambas (bloco)';
+  $handler->display->display_options['title'] = 'Emprestei';
+  $handler->display->display_options['display_description'] = 'Muambas que emprestei (bloco)';
+  $handler->display->display_options['defaults']['pager'] = FALSE;
+  $handler->display->display_options['pager']['type'] = 'full';
+  $handler->display->display_options['pager']['options']['items_per_page'] = '5';
+  $handler->display->display_options['pager']['options']['expose']['items_per_page_label'] = 'Itens por página';
+  $handler->display->display_options['pager']['options']['expose']['items_per_page_options_all_label'] = '- Todos -';
+  $handler->display->display_options['pager']['options']['expose']['offset_label'] = 'Deslocamento';
+  $handler->display->display_options['defaults']['style_plugin'] = FALSE;
+  $handler->display->display_options['style_plugin'] = 'default';
+  $handler->display->display_options['defaults']['style_options'] = FALSE;
+  $handler->display->display_options['defaults']['row_plugin'] = FALSE;
+  $handler->display->display_options['row_plugin'] = 'fields';
+  $handler->display->display_options['defaults']['row_options'] = FALSE;
+  $handler->display->display_options['defaults']['filters'] = FALSE;
+  /* Filter criterion: Conteúdo: Publicado */
+  $handler->display->display_options['filters']['status']['id'] = 'status';
+  $handler->display->display_options['filters']['status']['table'] = 'node';
+  $handler->display->display_options['filters']['status']['field'] = 'status';
+  $handler->display->display_options['filters']['status']['value'] = 1;
+  $handler->display->display_options['filters']['status']['group'] = 0;
+  $handler->display->display_options['filters']['status']['expose']['operator'] = FALSE;
+  /* Filter criterion: Conteúdo: Tipo */
+  $handler->display->display_options['filters']['type']['id'] = 'type';
+  $handler->display->display_options['filters']['type']['table'] = 'node';
+  $handler->display->display_options['filters']['type']['field'] = 'type';
+  $handler->display->display_options['filters']['type']['value'] = array(
+    'muamba' => 'muamba',
+  );
+  /* Filter criterion: Usuário: Atual */
+  $handler->display->display_options['filters']['uid_current']['id'] = 'uid_current';
+  $handler->display->display_options['filters']['uid_current']['table'] = 'users';
+  $handler->display->display_options['filters']['uid_current']['field'] = 'uid_current';
+  $handler->display->display_options['filters']['uid_current']['relationship'] = 'uid';
+  $handler->display->display_options['filters']['uid_current']['value'] = '1';
+  /* Filter criterion: Muamba: Status */
+  $handler->display->display_options['filters']['status_1']['id'] = 'status_1';
+  $handler->display->display_options['filters']['status_1']['table'] = 'muamba';
+  $handler->display->display_options['filters']['status_1']['field'] = 'status';
+  $handler->display->display_options['filters']['status_1']['relationship'] = 'nid';
+  $handler->display->display_options['filters']['status_1']['value'] = array(
+    1 => '1',
+  );
+  /* Filter criterion: Muamba: Ativo */
+  $handler->display->display_options['filters']['active']['id'] = 'active';
+  $handler->display->display_options['filters']['active']['table'] = 'muamba';
+  $handler->display->display_options['filters']['active']['field'] = 'active';
+  $handler->display->display_options['filters']['active']['value'] = '1';
+
+  /* Display: Peguei (bloco) */
+  $handler = $view->new_display('block', 'Peguei (bloco)', 'block_5');
+  $handler->display->display_options['defaults']['title'] = FALSE;
+  $handler->display->display_options['title'] = 'Peguei emprestado';
+  $handler->display->display_options['display_description'] = 'Peguei emprestado (bloco)';
   $handler->display->display_options['defaults']['pager'] = FALSE;
   $handler->display->display_options['pager']['type'] = 'full';
   $handler->display->display_options['pager']['options']['items_per_page'] = '5';
@@ -517,6 +718,14 @@ function muamba_interface_views_default_views() {
   $handler->display->display_options['filters']['uid_current']['relationship'] = 'uid';
   $handler->display->display_options['filters']['uid_current']['value'] = '0';
   $handler->display->display_options['filters']['uid_current']['group'] = 0;
+  /* Filter criterion: Muamba: Status */
+  $handler->display->display_options['filters']['status_2']['id'] = 'status_2';
+  $handler->display->display_options['filters']['status_2']['table'] = 'muamba';
+  $handler->display->display_options['filters']['status_2']['field'] = 'status';
+  $handler->display->display_options['filters']['status_2']['value'] = array(
+    1 => '1',
+  );
+  $handler->display->display_options['filters']['status_2']['group'] = 0;
 
   /* Display: Favoritas (bloco) */
   $handler = $view->new_display('block', 'Favoritas (bloco)', 'block_3');
@@ -763,6 +972,10 @@ function muamba_interface_views_default_views() {
   $handler->display->display_options['fields']['ops']['empty_zero'] = 0;
   $handler->display->display_options['fields']['ops']['hide_alter_empty'] = 0;
   $handler->display->display_options['fields']['ops']['link_type'] = 'toggle';
+  $handler->display->display_options['filter_groups']['groups'] = array(
+    0 => 'AND',
+    1 => 'OR',
+  );
   $handler->display->display_options['defaults']['filters'] = FALSE;
   /* Filter criterion: Conteúdo: Publicado */
   $handler->display->display_options['filters']['status']['id'] = 'status';
@@ -786,57 +999,24 @@ function muamba_interface_views_default_views() {
   $handler->display->display_options['filters']['uid_current']['relationship'] = 'uid';
   $handler->display->display_options['filters']['uid_current']['value'] = '0';
   $handler->display->display_options['filters']['uid_current']['group'] = 0;
-
-  /* Display: Emprestei (bloco) */
-  $handler = $view->new_display('block', 'Emprestei (bloco)', 'block_4');
-  $handler->display->display_options['display_description'] = 'Muambas que emprestei (bloco)';
-  $handler->display->display_options['defaults']['pager'] = FALSE;
-  $handler->display->display_options['pager']['type'] = 'full';
-  $handler->display->display_options['pager']['options']['items_per_page'] = '5';
-  $handler->display->display_options['pager']['options']['expose']['items_per_page_label'] = 'Itens por página';
-  $handler->display->display_options['pager']['options']['expose']['items_per_page_options_all_label'] = '- Todos -';
-  $handler->display->display_options['pager']['options']['expose']['offset_label'] = 'Deslocamento';
-  $handler->display->display_options['defaults']['style_plugin'] = FALSE;
-  $handler->display->display_options['style_plugin'] = 'default';
-  $handler->display->display_options['defaults']['style_options'] = FALSE;
-  $handler->display->display_options['defaults']['row_plugin'] = FALSE;
-  $handler->display->display_options['row_plugin'] = 'fields';
-  $handler->display->display_options['defaults']['row_options'] = FALSE;
-  $handler->display->display_options['defaults']['filters'] = FALSE;
-  /* Filter criterion: Conteúdo: Publicado */
-  $handler->display->display_options['filters']['status']['id'] = 'status';
-  $handler->display->display_options['filters']['status']['table'] = 'node';
-  $handler->display->display_options['filters']['status']['field'] = 'status';
-  $handler->display->display_options['filters']['status']['value'] = 1;
-  $handler->display->display_options['filters']['status']['group'] = 0;
-  $handler->display->display_options['filters']['status']['expose']['operator'] = FALSE;
-  /* Filter criterion: Conteúdo: Tipo */
-  $handler->display->display_options['filters']['type']['id'] = 'type';
-  $handler->display->display_options['filters']['type']['table'] = 'node';
-  $handler->display->display_options['filters']['type']['field'] = 'type';
-  $handler->display->display_options['filters']['type']['value'] = array(
-    'muamba' => 'muamba',
-  );
-  /* Filter criterion: Usuário: Atual */
-  $handler->display->display_options['filters']['uid_current']['id'] = 'uid_current';
-  $handler->display->display_options['filters']['uid_current']['table'] = 'users';
-  $handler->display->display_options['filters']['uid_current']['field'] = 'uid_current';
-  $handler->display->display_options['filters']['uid_current']['relationship'] = 'uid';
-  $handler->display->display_options['filters']['uid_current']['value'] = '1';
+  /* Filter criterion: Muamba: Ativo */
+  $handler->display->display_options['filters']['active']['id'] = 'active';
+  $handler->display->display_options['filters']['active']['table'] = 'muamba';
+  $handler->display->display_options['filters']['active']['field'] = 'active';
+  $handler->display->display_options['filters']['active']['value'] = '1';
+  $handler->display->display_options['filters']['active']['group'] = 1;
   /* Filter criterion: Muamba: Status */
   $handler->display->display_options['filters']['status_1']['id'] = 'status_1';
   $handler->display->display_options['filters']['status_1']['table'] = 'muamba';
   $handler->display->display_options['filters']['status_1']['field'] = 'status';
-  $handler->display->display_options['filters']['status_1']['relationship'] = 'nid';
-  $handler->display->display_options['filters']['status_1']['value'] = array(
-    1 => '1',
-  );
+  $handler->display->display_options['filters']['status_1']['operator'] = 'empty';
+  $handler->display->display_options['filters']['status_1']['group'] = 1;
 
-  /* Display: Peguei (bloco) */
-  $handler = $view->new_display('block', 'Peguei (bloco)', 'block_5');
+  /* Display: Todas (bloco) */
+  $handler = $view->new_display('block', 'Todas (bloco)', 'block_2');
   $handler->display->display_options['defaults']['title'] = FALSE;
-  $handler->display->display_options['title'] = 'Peguei emprestado';
-  $handler->display->display_options['display_description'] = 'Peguei emprestado (bloco)';
+  $handler->display->display_options['title'] = 'Todas as muambas';
+  $handler->display->display_options['display_description'] = 'Todas as muambas (bloco)';
   $handler->display->display_options['defaults']['pager'] = FALSE;
   $handler->display->display_options['pager']['type'] = 'full';
   $handler->display->display_options['pager']['options']['items_per_page'] = '5';
@@ -956,14 +1136,6 @@ function muamba_interface_views_default_views() {
   $handler->display->display_options['filters']['uid_current']['relationship'] = 'uid';
   $handler->display->display_options['filters']['uid_current']['value'] = '0';
   $handler->display->display_options['filters']['uid_current']['group'] = 0;
-  /* Filter criterion: Muamba: Status */
-  $handler->display->display_options['filters']['status_2']['id'] = 'status_2';
-  $handler->display->display_options['filters']['status_2']['table'] = 'muamba';
-  $handler->display->display_options['filters']['status_2']['field'] = 'status';
-  $handler->display->display_options['filters']['status_2']['value'] = array(
-    1 => '1',
-  );
-  $handler->display->display_options['filters']['status_2']['group'] = 0;
   $translatables['muambas'] = array(
     t('Master'),
     t('Minhas muambas'),
@@ -981,13 +1153,17 @@ function muamba_interface_views_default_views() {
     t('Minhas'),
     t('Minhas (bloco)'),
     t('Minhas muambas (bloco)'),
-    t('Disponíveis (bloco)'),
+    t('Disponíveis'),
     t('Muambas disponíveis'),
-    t('Muambas disponíveis (bloco)'),
     t('flag'),
-    t('Todas (bloco)'),
-    t('Todas as muambas'),
-    t('Todas as muambas (bloco)'),
+    t('Disponíveis (bloco)'),
+    t('Muambas disponíveis (bloco)'),
+    t('Emprestei (bloco)'),
+    t('Emprestei'),
+    t('Muambas que emprestei (bloco)'),
+    t('Peguei (bloco)'),
+    t('Peguei emprestado'),
+    t('Peguei emprestado (bloco)'),
     t('Favoritas (bloco)'),
     t('Favoritos'),
     t('Muambas favoritas (bloco)'),
@@ -995,11 +1171,9 @@ function muamba_interface_views_default_views() {
     t('Dono(a)'),
     t('Disponível?'),
     t('Status'),
-    t('Emprestei (bloco)'),
-    t('Muambas que emprestei (bloco)'),
-    t('Peguei (bloco)'),
-    t('Peguei emprestado'),
-    t('Peguei emprestado (bloco)'),
+    t('Todas (bloco)'),
+    t('Todas as muambas'),
+    t('Todas as muambas (bloco)'),
   );
   $export['muambas'] = $view;
 
@@ -1161,7 +1335,7 @@ function muamba_interface_views_default_views() {
   $handler->display->display_options['fields']['field_descricao']['empty_zero'] = 0;
   $handler->display->display_options['fields']['field_descricao']['hide_alter_empty'] = 0;
   $handler->display->display_options['fields']['field_descricao']['field_api_classes'] = 0;
-  /* Campo: Organic groups group: Created */
+  /* Campo: OG group: Created */
   $handler->display->display_options['fields']['created']['id'] = 'created';
   $handler->display->display_options['fields']['created']['table'] = 'og';
   $handler->display->display_options['fields']['created']['field'] = 'created';
@@ -1177,7 +1351,7 @@ function muamba_interface_views_default_views() {
   $handler->display->display_options['fields']['created']['hide_empty'] = 0;
   $handler->display->display_options['fields']['created']['empty_zero'] = 0;
   $handler->display->display_options['fields']['created']['date_format'] = 'time ago';
-  /* Filter criterion: Organic groups group: State */
+  /* Filter criterion: OG group: State */
   $handler->display->display_options['filters']['state']['id'] = 'state';
   $handler->display->display_options['filters']['state']['table'] = 'og';
   $handler->display->display_options['filters']['state']['field'] = 'state';
@@ -1267,7 +1441,7 @@ function muamba_interface_views_default_views() {
   $handler->display->display_options['fields']['field_descricao']['empty_zero'] = 0;
   $handler->display->display_options['fields']['field_descricao']['hide_alter_empty'] = 0;
   $handler->display->display_options['fields']['field_descricao']['field_api_classes'] = 0;
-  /* Campo: Organic groups group: Created */
+  /* Campo: OG group: Created */
   $handler->display->display_options['fields']['created']['id'] = 'created';
   $handler->display->display_options['fields']['created']['table'] = 'og';
   $handler->display->display_options['fields']['created']['field'] = 'created';
@@ -1437,7 +1611,7 @@ function muamba_interface_views_default_views() {
   $handler->display->display_options['fields']['field_descricao']['empty_zero'] = 0;
   $handler->display->display_options['fields']['field_descricao']['hide_alter_empty'] = 0;
   $handler->display->display_options['fields']['field_descricao']['field_api_classes'] = 0;
-  /* Campo: Organic groups group: Created */
+  /* Campo: OG group: Created */
   $handler->display->display_options['fields']['created']['id'] = 'created';
   $handler->display->display_options['fields']['created']['table'] = 'og';
   $handler->display->display_options['fields']['created']['field'] = 'created';
@@ -1572,7 +1746,7 @@ function muamba_interface_views_default_views() {
   $handler->display->display_options['sorts']['created']['field'] = 'created';
   $handler->display->display_options['sorts']['created']['relationship'] = 'og_membership_rel';
   $handler->display->display_options['sorts']['created']['order'] = 'DESC';
-  /* Contextual filter: OG membership: Grupo gid */
+  /* Filtro contextual: OG membership: Grupo gid */
   $handler->display->display_options['arguments']['group']['id'] = 'group';
   $handler->display->display_options['arguments']['group']['table'] = 'og_membership';
   $handler->display->display_options['arguments']['group']['field'] = 'group';
@@ -1707,7 +1881,7 @@ function muamba_interface_views_default_views() {
   $handler->display->display_options['relationships']['og_rel']['table'] = 'node';
   $handler->display->display_options['relationships']['og_rel']['field'] = 'og_rel';
   $handler->display->display_options['relationships']['og_rel']['required'] = 0;
-  /* Relação: Organic groups group: OG membership */
+  /* Relação: OG group: OG membership */
   $handler->display->display_options['relationships']['og_membership']['id'] = 'og_membership';
   $handler->display->display_options['relationships']['og_membership']['table'] = 'og';
   $handler->display->display_options['relationships']['og_membership']['field'] = 'og_membership';
@@ -1764,7 +1938,7 @@ function muamba_interface_views_default_views() {
   $handler->display->display_options['sorts']['title']['id'] = 'title';
   $handler->display->display_options['sorts']['title']['table'] = 'node';
   $handler->display->display_options['sorts']['title']['field'] = 'title';
-  /* Contextual filter: We pass to the "Entity ID" the User ID. */
+  /* Filtro contextual: We pass to the "Entity ID" the User ID. */
   $handler->display->display_options['arguments']['etid']['id'] = 'etid';
   $handler->display->display_options['arguments']['etid']['table'] = 'og_membership';
   $handler->display->display_options['arguments']['etid']['field'] = 'etid';
@@ -1910,7 +2084,7 @@ function muamba_interface_views_default_views() {
   $handler->display->display_options['fields']['created']['empty_zero'] = 0;
   $handler->display->display_options['fields']['created']['date_format'] = 'time ago';
   $handler->display->display_options['defaults']['arguments'] = FALSE;
-  /* Contextual filter: We pass to the "Entity ID" the User ID. */
+  /* Filtro contextual: We pass to the "Entity ID" the User ID. */
   $handler->display->display_options['arguments']['etid']['id'] = 'etid';
   $handler->display->display_options['arguments']['etid']['table'] = 'og_membership';
   $handler->display->display_options['arguments']['etid']['field'] = 'etid';
@@ -2524,8 +2698,8 @@ function muamba_interface_views_default_views() {
   $handler->display->display_options['fields']['changed']['date_format'] = 'raw time ago';
   $handler->display->display_options['path'] = 'transacoes';
 
-  /* Display: Pedi */
-  $handler = $view->new_display('block', 'Pedi', 'block_1');
+  /* Display: Pedi (bloco) */
+  $handler = $view->new_display('block', 'Pedi (bloco)', 'block_1');
   $handler->display->display_options['defaults']['title'] = FALSE;
   $handler->display->display_options['title'] = 'Muambas que pedi';
   $handler->display->display_options['display_description'] = 'Muambas que pedi';
@@ -2774,8 +2948,8 @@ function muamba_interface_views_default_views() {
   $handler->display->display_options['filters']['active']['field'] = 'active';
   $handler->display->display_options['filters']['active']['value'] = '1';
 
-  /* Display: Me pediram */
-  $handler = $view->new_display('block', 'Me pediram', 'block_2');
+  /* Display: Me pediram (bloco) */
+  $handler = $view->new_display('block', 'Me pediram (bloco)', 'block_2');
   $handler->display->display_options['defaults']['title'] = FALSE;
   $handler->display->display_options['title'] = 'Muambas que me pediram';
   $handler->display->display_options['display_description'] = 'Muambas que me pediram';
@@ -3022,9 +3196,16 @@ function muamba_interface_views_default_views() {
   $handler->display->display_options['filters']['active']['table'] = 'muamba';
   $handler->display->display_options['filters']['active']['field'] = 'active';
   $handler->display->display_options['filters']['active']['value'] = '1';
+  /* Filter criterion: Muamba: Status */
+  $handler->display->display_options['filters']['status']['id'] = 'status';
+  $handler->display->display_options['filters']['status']['table'] = 'muamba';
+  $handler->display->display_options['filters']['status']['field'] = 'status';
+  $handler->display->display_options['filters']['status']['value'] = array(
+    0 => '0',
+  );
 
-  /* Display: Histórico */
-  $handler = $view->new_display('block', 'Histórico', 'block_3');
+  /* Display: Histórico (bloco) */
+  $handler = $view->new_display('block', 'Histórico (bloco)', 'block_3');
   $handler->display->display_options['defaults']['title'] = FALSE;
   $handler->display->display_options['title'] = 'Transações passadas';
   $handler->display->display_options['display_description'] = 'Histórico de transações';
@@ -3372,12 +3553,12 @@ function muamba_interface_views_default_views() {
     t('Ativas'),
     t('Geral'),
     t('Dono(a)'),
-    t('Pedi'),
+    t('Pedi (bloco)'),
     t('Muambas que pedi'),
     t('Última atualização'),
-    t('Me pediram'),
+    t('Me pediram (bloco)'),
     t('Muambas que me pediram'),
-    t('Histórico'),
+    t('Histórico (bloco)'),
     t('Transações passadas'),
     t('Histórico de transações'),
   );