Index: l10n_community/l10n_community.css
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/l10n_server/l10n_community/Attic/l10n_community.css,v
retrieving revision 1.1.2.10.2.6.2.11
diff -u -p -r1.1.2.10.2.6.2.11 l10n_community.css
--- l10n_community/l10n_community.css 5 Jun 2010 07:37:08 -0000 1.1.2.10.2.6.2.11
+++ l10n_community/l10n_community.css 16 Jun 2010 08:01:48 -0000
@@ -7,9 +7,11 @@ div.admin .admin-panel-contribute {
position: relative;
}
table.l10n-community-overview {
+ float: left;
+}
+table.l10n-community-overview-2col {
width: 45%;
margin-left: 1em;
- float: left;
}
table.l10n-community-overview td {
vertical-align: middle;
Index: l10n_community/l10n_community.module
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/l10n_server/l10n_community/Attic/l10n_community.module,v
retrieving revision 1.1.2.23.2.66.2.15
diff -u -p -r1.1.2.23.2.66.2.15 l10n_community.module
--- l10n_community/l10n_community.module 9 Jun 2010 18:31:33 -0000 1.1.2.23.2.66.2.15
+++ l10n_community/l10n_community.module 16 Jun 2010 08:01:48 -0000
@@ -333,16 +333,13 @@ function l10n_community_block($op = 'lis
case 'list':
$blocks = array(
'help' => array(
- 'info' => t('Translation help'),
- 'weight' => 2,
- 'enabled' => 1,
- 'region' => 'left'
+ 'info' => t('Localization server help'),
),
'stats' => array(
- 'info' => t('Quick statistics'),
- 'weight' => 3,
- 'enabled' => 1,
- 'region' => 'left'
+ 'info' => t('Localization server quick statistics'),
+ ),
+ 'contribute' => array(
+ 'info' => t('Localization server contribute'),
),
);
return $blocks;
@@ -359,6 +356,12 @@ function l10n_community_block($op = 'lis
return l10n_community_block_stats();
}
return;
+ case 'contribute':
+ if (user_access('access localization community')) {
+ include_once drupal_get_path('module', 'l10n_community') .'/welcome.inc';
+ return l10n_community_block_contribute();
+ }
+ return;
}
}
}
@@ -463,7 +466,7 @@ function l10n_community_block_stats() {
}
$block = array(
- 'subject' => t('Quick community statistics'),
+ 'subject' => t('Quick statistics'),
'content' => theme('item_list', array_merge($stats, array(
format_plural($stats_numbers['users'], '1 contributor', '@count contributors'),
format_plural($stats_numbers['projects'], '1 project managed', '@count projects managed'),
Index: l10n_community/pages.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/l10n_server/l10n_community/Attic/pages.inc,v
retrieving revision 1.1.2.20.2.24.2.17
diff -u -p -r1.1.2.20.2.24.2.17 pages.inc
--- l10n_community/pages.inc 10 Jun 2010 12:27:16 -0000 1.1.2.20.2.24.2.17
+++ l10n_community/pages.inc 16 Jun 2010 08:01:48 -0000
@@ -494,8 +494,8 @@ function theme_l10n_community_progress_h
*/
function theme_l10n_community_table($header, $table) {
if (($row_count = count($table)) > 1) {
- $output = theme('table', $header, array_slice($table, 0, ceil($row_count/2)), array('class' => 'l10n-community-overview'));
- $output .= theme('table', $header, array_slice($table, ceil($row_count/2)), array('class' => 'l10n-community-overview'));
+ $output = theme('table', $header, array_slice($table, 0, ceil($row_count/2)), array('class' => 'l10n-community-overview l10n-community-overview-2col'));
+ $output .= theme('table', $header, array_slice($table, ceil($row_count/2)), array('class' => 'l10n-community-overview l10n-community-overview-2col'));
return $output;
}
else {
Index: l10n_community/welcome.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/l10n_server/l10n_community/Attic/welcome.inc,v
retrieving revision 1.1.2.7.2.17.2.9
diff -u -p -r1.1.2.7.2.17.2.9 welcome.inc
--- l10n_community/welcome.inc 9 Jun 2010 18:31:33 -0000 1.1.2.7.2.17.2.9
+++ l10n_community/welcome.inc 16 Jun 2010 08:01:48 -0000
@@ -18,23 +18,21 @@
* fit perfectly with all listings, so I bended some stuff more to comply.
*/
function l10n_community_welcome_page() {
- // Build stats block.
- $stats_block = l10n_community_block_stats();
- $block = array(
- 'title' => t('Quick stats'),
- 'description' => t('Some facts about this community'),
- 'content' => $stats_block['content'],
- );
- $stats_output = theme('admin_block', $block);
-
- // Build highlights block.
- $highlight_output = '';
if ($project = l10n_community_get_highlighted_project()) {
// Display progress status of the highlighted project.
include_once drupal_get_path('module', 'l10n_community') .'/pages.inc';
- $highlight_output = theme('admin_block', l10n_community_language_progress_for_project($project, l10n_community_get_languages(), t('Translation status for %project', array('%project' => $project->title)), t('Highlighted project')));
+ $output = theme('admin_block', l10n_community_language_progress_for_project($project, l10n_community_get_languages(), t('Translation status for %project', array('%project' => $project->title)), t('Highlighted project')));
+ }
+ else {
+ $output = t('No highlighted project set.');
}
+ return $output;
+}
+/**
+ * Block builder function to generate the main contribution block.
+ */
+function l10n_community_block_contribute() {
// Build contribution call to action block.
$content = '';
if (!$GLOBALS['user']->uid) {
@@ -43,27 +41,10 @@ function l10n_community_welcome_page() {
$content .= ''. t('You can review the work being done here, but to participate, first you need to create an account and/or log in.', array('@register' => url('user/login'))) .'
';
}
$content .= drupal_get_form('l10n_community_pick_go') .'';
- $block = array(
- 'title' => t('Contribute'),
- 'description' => t('Suggest, translate, review'),
- 'content' => ''. $content .'
'
+ return array(
+ 'subject' => t('Contribute'),
+ 'content' => $content
);
- $contribute_output = str_replace('class="admin-panel"', 'class="admin-panel admin-panel-contribute"', theme('admin_block', $block));
-
- // Build it alltogether.
- $output = '';
- return $output;
}
function l10n_community_pick_go() {