aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSilvio Rhatto <rhatto@riseup.net>2011-10-10 21:27:39 -0300
committerSilvio Rhatto <rhatto@riseup.net>2011-10-10 21:27:39 -0300
commitdb6fd9706157928ce20fc26689fe9db41d533537 (patch)
tree9c52c7992c2dea6f64461f76d694bd2d89e42033
parent5ffabe0ba48277792fa7c855fa9bee450a8c2c64 (diff)
downloadmuamba-db6fd9706157928ce20fc26689fe9db41d533537.tar.gz
muamba-db6fd9706157928ce20fc26689fe9db41d533537.tar.bz2
Adding flag and default user image
-rw-r--r--CREDITS.txt1
-rw-r--r--features/muamba_interface/muamba_interface.info6
-rw-r--r--features/muamba_interface/muamba_interface.strongarm.inc42
-rw-r--r--images/lego.orig.pngbin0 -> 24137 bytes
-rw-r--r--images/lego.pngbin0 -> 3083 bytes
-rw-r--r--muamba.info1
-rw-r--r--muamba.make2
7 files changed, 51 insertions, 1 deletions
diff --git a/CREDITS.txt b/CREDITS.txt
index 56f86ce..8531817 100644
--- 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 219e22f..77e31cd 100644
--- 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 ebfad8a..84933fd 100644
--- 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
index 0000000..b6d0b6f
--- /dev/null
+++ b/images/lego.orig.png
Binary files differ
diff --git a/images/lego.png b/images/lego.png
new file mode 100644
index 0000000..7438ee0
--- /dev/null
+++ b/images/lego.png
Binary files differ
diff --git a/muamba.info b/muamba.info
index 0ef5128..8b27a1c 100644
--- 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 c53f4a2..bbcaabd 100644
--- 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