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.2
diff -u -p -r1.1.2.2 l10n_community.css
--- l10n_community/l10n_community.css 1 Oct 2007 19:58:48 -0000 1.1.2.2
+++ l10n_community/l10n_community.css 15 Oct 2007 19:12:38 -0000
@@ -26,10 +26,13 @@
float: left;
}
.l10n-community-progress-untranslated {
- background-color: #b93131;
+ background-color: #ddd;
}
.l10n-community-progress-has-suggestion {
- background-color: #6a4970;
+ background-color: #ffff00;
+}
+#l10n-community-overview td.l10n-community-status-label {
+ text-align: left;
}
/* String search filtering form */
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.4
diff -u -p -r1.1.2.4 pages.inc
--- l10n_community/pages.inc 11 Oct 2007 20:47:49 -0000 1.1.2.4
+++ l10n_community/pages.inc 15 Oct 2007 21:16:47 -0000
@@ -35,23 +35,19 @@ function l10n_community_overview_languag
$perm = l10n_community_get_permission($langcode);
$table[] = array_merge(
array(
- array('data' => "$language ($langcode)", 'class' => 'rowhead'),
- l(t('Projects'), 'translate/languages/'. $langcode, array('title' => t('Go to the project list.'))),
- ($perm == L10N_PERM_NONE ? t('n/a') : l(t('Import'), 'translate/languages/'. $langcode . '/import')),
+ array('data' => l("$language ($langcode)", 'translate/languages/'. $langcode, array('title' => t('Go to the project list.'))), 'class' => 'rowhead'),
),
- count($groups) ? (isset($groups[$langcode]) ? l(t('Group'), 'node/'. $groups[$langcode]->nid, array('title' => t('Go to the group homepage.'))) : t('n/a')) : array(),
- isset($string_counts[$langcode]) ? theme('l10n_community_progress_columns', $num_source, $string_counts[$langcode][0], $string_counts[$langcode][1]) : theme('l10n_community_progress_columns', $num_source, 0, 0)
+ isset($string_counts[$langcode]) ? theme('l10n_community_progress_columns', $num_source, $string_counts[$langcode][0], $string_counts[$langcode][1]) : theme('l10n_community_progress_columns', $num_source, 0, 0),
+ array(
+ ($perm == L10N_PERM_NONE ? t('n/a') : l(t('Import'), 'translate/languages/'. $langcode . '/import')),
+ )
);
}
$header = array(
array('data' => t('Language'), 'class' => 'rowhead'),
- t('Projects'),
- t('Import'),
- t('Group'),
t('Overall status'),
- t('Translated'),
- t('Has suggestion'),
- t('Untranslated')
+ '', // No header for the status bar label.
+ t('Options')
);
if (!count($groups)) {
unset($header[3]);
@@ -81,11 +77,12 @@ function l10n_community_overview_project
list($sum, $translated, $suggested) = $string_counts[$project->pid];
$table[] = array_merge(
array(
- array('data' => $project->title, 'class' => 'rowhead'),
- l(t('Languages'), 'translate/projects/'. $uri),
- l(t('Export'), 'translate/projects/'. $uri .'/export'),
+ array('data' => l($project->title, 'translate/projects/'. $uri), 'class' => 'rowhead'),
),
- theme('l10n_community_progress_columns', $sum, $translated, $suggested)
+ theme('l10n_community_progress_columns', $sum, $translated, $suggested),
+ array(
+ l(t('Export'), 'translate/projects/'. $uri .'/export')
+ )
);
}
}
@@ -93,12 +90,9 @@ function l10n_community_overview_project
'table',
array(
array('data' => t('Project'), 'class' => 'rowhead'),
- t('Languages'),
- t('Export template'),
t('Overall status'),
- t('Translated'),
- t('Has suggestion'),
- t('Untranslated')
+ '', // No header for the status bar label.
+ t('Options')
),
$table,
array('id' => 'l10n-community-overview')
@@ -134,11 +128,15 @@ function l10n_community_status_projects(
list($sum, $translated, $suggested) = $string_counts[$project->pid];
$table[] = array_merge(
array(
- array('data' => l($project->title, 'translate/languages/'. $langcode .'/' . $uri), 'class' => 'rowhead'),
- ($perm != L10N_PERM_NONE ? l(t('Import'), 'translate/languages/'. $langcode . '/'. $uri .'/import') : t('n/a')),
- l(t('Export'), 'translate/languages/'. $langcode . '/'. $uri .'/export')
+ array('data' => l($project->title, 'translate/languages/'. $langcode .'/' . $uri), 'class' => 'rowhead')
),
- theme('l10n_community_progress_columns', $sum, $translated, $suggested)
+ theme('l10n_community_progress_columns', $sum, $translated, $suggested),
+ array(
+ theme('links', array(
+ $perm != L10N_PERM_NONE ? array('title' => t('Import'), 'href' => 'translate/languages/'. $langcode . '/'. $uri .'/import') : array(),
+ array('title' => t('Export'), 'href' => 'translate/languages/'. $langcode . '/'. $uri .'/export')
+ ))
+ )
);
}
}
@@ -146,12 +144,9 @@ function l10n_community_status_projects(
'table',
array(
array('data' => t('Project'), 'class' => 'rowhead'),
- t('Import'),
- t('Export'),
t('Overall status'),
- t('Translated'),
- t('Has suggestion'),
- t('Untranslated')
+ '', // No header for the status bar label.
+ t('Options')
),
$table,
array('id' => 'l10n-community-overview')
@@ -188,10 +183,14 @@ function l10n_community_status_languages
$table[] = array_merge(
array(
array('data' => l("$language ($langcode)", 'translate/projects/'. $uri . '/'. $langcode, array(), NULL, NULL, FALSE, TRUE), 'class' => 'rowhead'),
- ($perm != L10N_PERM_NONE) ? l(t('Import'), 'translate/projects/'. $uri . '/'. $langcode .'/import') : t('n/a'),
- l(t('Export'), 'translate/projects/'. $uri . '/'. $langcode .'/export'),
),
- theme('l10n_community_progress_columns', $num_source, $string_counts[$langcode][0], $string_counts[$langcode][1])
+ theme('l10n_community_progress_columns', $num_source, $string_counts[$langcode][0], $string_counts[$langcode][1]),
+ array(
+ theme('links', array(
+ $perm != L10N_PERM_NONE ? array('title' => t('Import'), 'href' => 'translate/projects/'. $uri . '/'. $langcode .'/import') : array(),
+ array('title' => t('Export'), 'href' => 'translate/projects/'. $uri . '/'. $langcode .'/export')
+ ))
+ )
);
}
@@ -199,12 +198,9 @@ function l10n_community_status_languages
'table',
array(
array('data' => t('Language'), 'class' => 'rowhead'),
- t('Import'),
- t('Export'),
t('Overall status'),
- t('Translated'),
- t('Has suggestions'),
- t('Untranslated')
+ '', // No header for the status bar label.
+ t('Options')
),
$table,
array('id' => 'l10n-community-overview')
@@ -682,8 +678,8 @@ function l10n_community_format_text($str
function theme_l10n_community_progress_columns($sum, $translated, $has_suggestion) {
// Compute numbers, percentages and provide alternate text titles.
$status = array(
- 'translated' => array((int) $translated, round($translated / $sum * 100, 2), t('!percent translated')),
- 'has-suggestion' => array((int) $has_suggestion, round($has_suggestion / $sum * 100, 2), t('!percent has suggestion')),
+ 'translated' => array((int) $translated, round($translated / $sum * 100), t('!percent translated')),
+ 'has-suggestion' => array((int) $has_suggestion, round($has_suggestion / $sum * 100), t('!percent has suggestion')),
'untranslated' => array($sum - $translated - $has_suggestion, 0, t('!percent untranslated')),
);
$status['untranslated'][1] = 100 - $status['has-suggestion'][1] - $status['translated'][1];
@@ -697,11 +693,13 @@ function theme_l10n_community_progress_c
}
$bar .= '';
+ $bar_label = ''. t('@translated% translated', array('@translated' => $status['translated'][1])) .'';
+ $bar_label .= $status['has-suggestion'][0] ? ', '. t('@count suggested', array('@count' => $status['has-suggestion'][0])) : '';
+ $bar_label .= $status['untranslated'][0] ? ', '. t('@count untranslated', array('@count' => $status['untranslated'][0])) : '';
+
return array(
$bar,
- $status['translated'][0] .' ('. $status['translated'][1] .'%)',
- $status['has-suggestion'][0],
- $status['untranslated'][0]
+ array('data' => '('. $bar_label .')', 'class' => 'l10n-community-status-label')
);
}