Adding flag and default user image

diff --git a/CREDITS.txt b/CREDITS.txt
index 56f86cefd18288800e1cce572a13f8caceb341bc..853181763ac5b8957047d5bd6bccd77d95e64a09 100644 (file)
--- a/CREDITS.txt
+++ b/CREDITS.txt
@@ -20,3 +20,4 @@ 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
+http://www.openclipart.org/detail/22566/lego-smiley----happy-by-pitr

diff --git a/features/muamba_interface/muamba_interface.info b/features/muamba_interface/muamba_interface.info
index 219e22f7b9ce0e0e8bf0c65370c7d5a3f0ec94a4..77e31cde10a5538f3f0cf1851d0a2b6cfca34a8e 100644 (file)
--- a/features/muamba_interface/muamba_interface.info
+++ b/features/muamba_interface/muamba_interface.info
@@ -37,6 +37,12 @@ features[variable][] = "site_mail"
 features[variable][] = "site_name"
 features[variable][] = "theme_default"
 features[variable][] = "theme_settings"
+features[variable][] = "user_picture_default"
+features[variable][] = "user_picture_dimensions"
+features[variable][] = "user_picture_file_size"
+features[variable][] = "user_picture_guidelines"
+features[variable][] = "user_picture_path"
+features[variable][] = "user_picture_style"
 features[views_view][] = "muambas"
 features[views_view][] = "og_list"
 features[views_view][] = "transacoes"

diff --git a/features/muamba_interface/muamba_interface.strongarm.inc b/features/muamba_interface/muamba_interface.strongarm.inc
index ebfad8a4dc67e34f59abf510fac928af249b63ec..84933fd7c9ba2c39e8765f5c8843fcec50511f16 100644 (file)
--- a/features/muamba_interface/muamba_interface.strongarm.inc
+++ b/features/muamba_interface/muamba_interface.strongarm.inc
@@ -261,5 +261,47 @@ node/*/edit';
   );
   $export['theme_settings'] = $strongarm;
 
+  $strongarm = new stdClass;
+  $strongarm->disabled = FALSE; /* Edit this to true to make a default strongarm disabled initially */
+  $strongarm->api_version = 1;
+  $strongarm->name = 'user_picture_default';
+  $strongarm->value = 'sites/muamba/modules/muamba/images/lego.png';
+  $export['user_picture_default'] = $strongarm;
+
+  $strongarm = new stdClass;
+  $strongarm->disabled = FALSE; /* Edit this to true to make a default strongarm disabled initially */
+  $strongarm->api_version = 1;
+  $strongarm->name = 'user_picture_dimensions';
+  $strongarm->value = '1024x1024';
+  $export['user_picture_dimensions'] = $strongarm;
+
+  $strongarm = new stdClass;
+  $strongarm->disabled = FALSE; /* Edit this to true to make a default strongarm disabled initially */
+  $strongarm->api_version = 1;
+  $strongarm->name = 'user_picture_file_size';
+  $strongarm->value = '800';
+  $export['user_picture_file_size'] = $strongarm;
+
+  $strongarm = new stdClass;
+  $strongarm->disabled = FALSE; /* Edit this to true to make a default strongarm disabled initially */
+  $strongarm->api_version = 1;
+  $strongarm->name = 'user_picture_guidelines';
+  $strongarm->value = '';
+  $export['user_picture_guidelines'] = $strongarm;
+
+  $strongarm = new stdClass;
+  $strongarm->disabled = FALSE; /* Edit this to true to make a default strongarm disabled initially */
+  $strongarm->api_version = 1;
+  $strongarm->name = 'user_picture_path';
+  $strongarm->value = 'pictures';
+  $export['user_picture_path'] = $strongarm;
+
+  $strongarm = new stdClass;
+  $strongarm->disabled = FALSE; /* Edit this to true to make a default strongarm disabled initially */
+  $strongarm->api_version = 1;
+  $strongarm->name = 'user_picture_style';
+  $strongarm->value = 'thumbnail';
+  $export['user_picture_style'] = $strongarm;
+
   return $export;
 }

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

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

diff --git a/muamba.info b/muamba.info
index 0ef51281d80fef2e49d28d9c316a72fc4e806e0f..8b27a1cae766fff78c83159cad6144d53dac338a 100644 (file)
--- a/muamba.info
+++ b/muamba.info
@@ -12,3 +12,4 @@ dependencies[] = muamba_system
 dependencies[] = privatemsg
 dependencies[] = l10n_update
 dependencies[] = colorbox
+dependencies[] = flag

diff --git a/muamba.make b/muamba.make
index c53f4a23f77f55a0ca3f65d15ec46c4865e7e3b9..bbcaabd1bbd1eaa4ee2ef466da0e0040f0cbf164 100644 (file)
--- a/muamba.make
+++ b/muamba.make
@@ -10,7 +10,6 @@ core       = 7.x
 api = 2
 
 ; essential
-;projects[] = flag
 projects[] = views
 projects[] = ctools
 projects[] = features
@@ -20,6 +19,7 @@ projects[] = og
 projects[] = entity
 projects[] = libraries
 projects[] = colorbox 
+projects[flag][version] = 2.0-beta6
 
 ; administration
 projects[] = l10n_update