manuelcillero/suitedesk
manuelcillero/suitedesk
Archived
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

View details of Lexicon module, adding styles and global translationes

Browse source
This commit is contained in:
Manuel Cillero 2017-08-03 23:25:25 +02:00
parent d1100db28e
commit 97bc3e5e20
7 changed files with 68 additions and 58 deletions
Download patch file Download diff file Expand all files Collapse all files

4
modules/taxonomy/taxonomy.admin.inc
View file

@ -250,7 +250,7 @@ function taxonomy_overview_terms(&$form_state, $vocabulary) {
return taxonomy_vocabulary_confirm_reset_alphabetical($form_state, $vocabulary->vid);
}
drupal_set_title(t('Terms in %vocabulary', array('%vocabulary' => $vocabulary->name)));
drupal_set_title(t('Terms in %vocabulary', array('%vocabulary' => t($vocabulary->name))));
$form = array(
'#vocabulary' => (array)$vocabulary,
'#tree' => TRUE,
@ -620,7 +620,7 @@ function theme_taxonomy_overview_terms($form) {
* Menu callback; return the edit form for a new term after setting the title.
*/
function taxonomy_add_term_page($vocabulary) {
drupal_set_title(t('Add term to %vocabulary', array('%vocabulary' => $vocabulary->name)));
drupal_set_title(t('Add term to %vocabulary', array('%vocabulary' => t($vocabulary->name))));
return drupal_get_form('taxonomy_form_term' , $vocabulary);
}

6
modules/taxonomy/taxonomy.module
View file

@ -1362,11 +1362,11 @@ function taxonomy_help($path, $arg) {
}
switch ($vocabulary->hierarchy) {
case 0:
return '<p>'. t('%capital_name is a flat vocabulary. You may organize the terms in the %name vocabulary by using the handles on the left side of the table. To change the name or description of a term, click the <em>edit</em> link next to the term.', array('%capital_name' => drupal_ucfirst($vocabulary->name), '%name' => $vocabulary->name)) .'</p>';
return '<p>'. t('%capital_name is a flat vocabulary. You may organize the terms in the %name vocabulary by using the handles on the left side of the table. To change the name or description of a term, click the <em>edit</em> link next to the term.', array('%capital_name' => t(drupal_ucfirst($vocabulary->name)), '%name' => t($vocabulary->name))) .'</p>';
case 1:
return '<p>'. t('%capital_name is a single hierarchy vocabulary. You may organize the terms in the %name vocabulary by using the handles on the left side of the table. To change the name or description of a term, click the <em>edit</em> link next to the term.', array('%capital_name' => drupal_ucfirst($vocabulary->name), '%name' => $vocabulary->name)) .'</p>';
return '<p>'. t('%capital_name is a single hierarchy vocabulary. You may organize the terms in the %name vocabulary by using the handles on the left side of the table. To change the name or description of a term, click the <em>edit</em> link next to the term.', array('%capital_name' => t(drupal_ucfirst($vocabulary->name)), '%name' => t($vocabulary->name))) .'</p>';
case 2:
return '<p>'. t('%capital_name is a multiple hierarchy vocabulary. To change the name or description of a term, click the <em>edit</em> link next to the term. Drag and drop of multiple hierarchies is not supported, but you can re-enable drag and drop support by editing each term to include only a single parent.', array('%capital_name' => drupal_ucfirst($vocabulary->name))) .'</p>';
return '<p>'. t('%capital_name is a multiple hierarchy vocabulary. To change the name or description of a term, click the <em>edit</em> link next to the term. Drag and drop of multiple hierarchies is not supported, but you can re-enable drag and drop support by editing each term to include only a single parent.', array('%capital_name' => t(drupal_ucfirst($vocabulary->name)))) .'</p>';
}
case 'admin/content/taxonomy/add/vocabulary':
return '<p>'. t('Define how your vocabulary will be presented to administrators and users, and which content types to categorize with it. Tags allows users to create terms when submitting posts by typing a comma separated list. Otherwise terms are chosen from a select list and can only be created by users with the "administer taxonomy" permission.') .'</p>';

59
sites/all/modules/lexicon/css/lexicon.css
View file

@ -104,6 +104,7 @@ div.lexicon-letter {
}
.lexicon-links {
clear: both;
text-align: center;
background-color: #eeeeff;
color: #888888;
@ -115,22 +116,42 @@ div.lexicon-letter {
}
.lexicon-alphabar-instructions {
clear: both;
font-size: 89%;
font-style: italic;
}
.lexicon-admin-links {
clear: both;
margin: 0.5em 0 0 3.0em;
margin: 0;
}
.lexicon-admin-links ul {
padding: 0;
}
.lexicon-admin-links li {
list-style: none;
float: left;
margin-bottom: .8em;
}
.lexicon-admin-links li.lexicon_edit,
.lexicon-admin-links li.lexicon_admin {
float: right;
padding: 0 8px 3px;
margin: .5em 0 .5em .5em;
background-color: #ff6600;
}
.lexicon-admin-links li a {
padding: 5px;
color: #fff;
padding-right: 5px .8em 5px 5px;
}
.lexicon-admin-links li.lexicon_edit a,
.lexicon-admin-links li.lexicon_admin a {
font-size: 78%;
}
.lexicon-list dt img {
float: left;
}
}
.lexicon-list .taxonomy_image_wrapper {
width: 70px;
@ -203,7 +224,7 @@ span.hovertip_target {
}
.lexicon_checkboxes .form-item .description {
clear: both;
clear: both;
}
.lexicon-detailed {
@ -228,6 +249,34 @@ span.hovertip_target {
.block-lexicon {
font-size: 89%;
position: relative;
}
.block-lexicon .content {
height: 42px;
}
.block-lexicon input.form-text {
padding-right: 48px;
background: #fff;
font-weight: 300;
}
.block-lexicon button.form-submit {
position: absolute;
padding: 0;
top: 0;
right: 0;
width: 39px;
height: 39px;
color: #3c8dbc;
overflow: hidden;
}
.block-lexicon button.form-submit:hover {
color: #307095;
}
.block-lexicon button.form-submit span {
color: #fff;
display: block;
line-height: 34px;
margin: 0;
}
.lexicon-block-term-name {

14
sites/all/modules/lexicon/lexicon.module
View file

@ -38,14 +38,6 @@ function lexicon_help($path, $args = array()) {
return t('Maintain one or more lexicons on your site.');
break;
case 'lexicon':
if (!$args[1]) {
if (user_access('administer lexicon')) {
return t('<a href="!url">Lexicon settings page</a>', array('!url' => url('admin/settings/lexicon')));
}
}
break;
case 'lexicon_search#noresults':
return t('<ul>
<li>Check if your spelling is correct.</li>
@ -804,7 +796,7 @@ function _lexicon_alphabar($vid, &$tree) {
$output = '<div class="lexicon-links">'. implode($sep, $letters);
$output .= '<div class="lexicon-alphabar-instructions">';
$output .= variable_get('lexicon_alphabar_instruction', _alphabar_instruction_default());
$output .= t(variable_get('lexicon_alphabar_instruction', _alphabar_instruction_default()));
$output .= "</div></div>\n";
return $output;
@ -1085,7 +1077,7 @@ function lexicon_admin_links($vocabulary, $destination) {
}
if (user_access('administer taxonomy')) {
$links['lexicon_edit'] = array(
'title' => decode_entities(t('Edit @name', array('@name' => drupal_strtolower($vocabulary->name)))),
'title' => decode_entities(t('Edit @name', array('@name' => t(drupal_strtolower($vocabulary->name))))),
'href' => 'admin/content/taxonomy/edit/vocabulary/'. $vocabulary->vid,
'query' => $destination,
);
@ -1124,7 +1116,7 @@ function _lexicon_list() {
$class = $eo[++$i & 1];
if (user_access('administer taxonomy')) {
$links['lexicon_edit'] = array(
'title' => t('Edit @name', array('@name' => drupal_strto($vocabulary->name))),
'title' => t('Edit @name', array('@name' => t(drupal_strto($vocabulary->name)))),
'href' => 'admin/content/taxonomy/edit/vocabulary/'. $voc->vid,
'query' => $destination,
);

19
themes/zuitedesk/css/blocks.css
View file

@ -135,21 +135,15 @@ body.section-node-edit .block ul.menu li.active-trail > a {
.block-custom_search_blocks .content {
margin: 0;
}
.block-lexicon .content {
height: 42px;
}
.block-custom_search_blocks,
.block-lexicon {
.block-custom_search_blocks {
position: relative;
}
.block-custom_search_blocks input.form-text,
.block-lexicon input.form-text {
.block-custom_search_blocks input.form-text {
padding-right: 48px;
background: #fff;
font-weight: 300;
}
.block-custom_search_blocks button.form-submit,
.block-lexicon button.form-submit {
.block-custom_search_blocks button.form-submit {
position: absolute;
padding: 0;
top: 0;
@ -159,12 +153,10 @@ body.section-node-edit .block ul.menu li.active-trail > a {
color: #3c8dbc;
overflow: hidden;
}
.block-custom_search_blocks button.form-submit:hover,
.block-lexicon button.form-submit:hover {
.block-custom_search_blocks button.form-submit:hover {
color: #307095;
}
.block-custom_search_blocks button.form-submit span,
.block-lexicon button.form-submit span {
.block-custom_search_blocks button.form-submit span {
color: #fff;
display: block;
line-height: 34px;
@ -177,4 +169,3 @@ body.section-node-edit .block ul.menu li.active-trail > a {
#block-storm-storm_dashboard_block .content {
margin: .5em 0;
}

22
themes/zuitedesk/css/suitedesk.css
View file

@ -1083,28 +1083,6 @@ body.i18n-es .date-nav div.date-prev {
margin-right: .4em;
}
/*
* "Lexicon" view.
*/
.lexicon-admin-links {
margin: 0;
}
.lexicon-admin-links ul {
padding: 0;
}
.lexicon-admin-links ul li {
list-style: none;
float: left;
margin-bottom: .8em;
}
.lexicon-admin-links ul li a {
color: #fff;
padding-right: .8em;
}
#glosario {
clear: both;
}
/*
* "SuiteDesk" node.
*/

2
themes/zuitedesk/zuitedesk.info
View file

@ -1,6 +1,6 @@
name = SuiteDesk Theme
description = SuiteDesk Theme Zen.
version = 0.2.19
version = 0.2.20
screenshot = screenshot.png