Commit ee37a85f authored by Ghada El-Zoghbi's avatar Ghada El-Zoghbi Committed by Gerrit Code Review
Browse files

Merge "Changing the display name of 'text box' to note (Bug #1339113)"

parents ea47410c 6a190784
......@@ -11,12 +11,12 @@
defined('INTERNAL') || die();
$string['title'] = 'Text box';
$string['title1'] = 'Note';
$string['description'] = 'Add notes to your page';
$string['blockcontent'] = 'Block content';
$string['usecontentfromanothertextbox'] = 'Use content from another text box';
$string['usecontentfromanothertextbox1'] = 'Use content from another note';
$string['textusedinotherblocks'] = 'If you edit the text of this block, it will also be changed in %s other block(s) where it appears.';
$string['managealltextboxcontent'] = 'Manage all text box content';
$string['managealltextboxcontent1'] = 'Manage all note content';
$string['readonlymessage'] = 'The text you have selected is not editable on this page.';
$string['makeacopy'] = 'Make a copy';
......
<!-- @license http://www.gnu.org/copyleft/gpl.html GNU GPL version 3 or later -->
<!-- @copyright For copyright information on Mahara, please see the README file distributed with this software. -->
<h3>Reusable text box content</h3>
<p>It is possible to include the same text box content in several
<h3>Reusable note content</h3>
<p>It is possible to include the same note content in several
blocks, and these blocks can appear on different pages. Updating the
text in one block will also change it in all other pages in which it
information in one block will also change it in all other pages in which it
appears. You can see a list of all the pages on which a particular
note is contained in your notes area under the "Content" menu.</p>
<p>When you are editing a group or institution page, remember that
......
<!-- @license http://www.gnu.org/copyleft/gpl.html GNU GPL version 3 or later -->
<!-- @copyright For copyright information on Mahara, please see the README file distributed with this software. -->
<h3>Read-only text box content</h3>
<p>You can sometimes include a text box note on a page even when the
<h3>Read-only note content</h3>
<p>You can sometimes include a note on a page even when the
note is owned by someone other than the page's owner. For example,
you may have permission to include notes belonging to one of your
groups inside your own personal page.</p>
......
......@@ -14,7 +14,7 @@ defined('INTERNAL') || die();
class PluginBlocktypeTextbox extends PluginBlocktype {
public static function get_title() {
return get_string('title', 'blocktype.internal/textbox');
return get_string('title1', 'blocktype.internal/textbox');
}
public static function get_description() {
......@@ -369,13 +369,13 @@ EOF;
'type' => 'html',
'class' => 'nojs-hidden-block',
'value' => '<a id="chooseartefactlink" href="">'
. get_string('usecontentfromanothertextbox', 'blocktype.internal/textbox') . '</a>',
. get_string('usecontentfromanothertextbox1', 'blocktype.internal/textbox') . '</a>',
),
'managenotes' => array(
'type' => 'html',
'class' => 'right hidden',
'value' => '<a href="' . $manageurl . '" target="_blank">'
. get_string('managealltextboxcontent', 'blocktype.internal/textbox') . ' &raquo;</a>',
. get_string('managealltextboxcontent1', 'blocktype.internal/textbox') . ' &raquo;</a>',
),
'artefactid' => self::artefactchooser_element(isset($artefactid) ? $artefactid : null),
'license' => license_form_el_basic(isset($artefact) ? $artefact : null),
......
......@@ -121,7 +121,7 @@ $string['mynotes'] = 'My notes';
$string['notesfor'] = "Notes for %s";
$string['containedin'] = "Contained in";
$string['currenttitle'] = "Titled";
$string['notesdescription'] = 'These are the html notes you have created inside text box blocks on your pages.';
$string['notesdescription1'] = 'These are the html notes you have created inside note blocks on your pages.';
$string['editnote'] = 'Edit note';
$string['confirmdeletenote'] = 'This note is used in %d blocks and %d pages. If you delete it, all the blocks which currently contain the text will appear empty.';
$string['notedeleted'] = 'Note deleted';
......
{include file="header.tpl"}
<p>{str tag=notesdescription section=artefact.internal}</p>
<p>{str tag=notesdescription1 section=artefact.internal}</p>
<table id="notes" class="fullwidth listing">
<thead>
<tr>
......
......@@ -97,7 +97,8 @@ $string['blocktype_recentforumposts'] = 'Block: Recent forum posts';
$string['blocktype_recentposts'] = 'Block: Recent journal entries';
$string['blocktype_resumefield'] = 'Block: Résumé field';
$string['blocktype_taggedposts'] = 'Block: Tagged journal entries';
$string['blocktype_textbox'] = 'Block: Text box';
$string['blocktype_text'] = 'Block: Text';
$string['blocktype_textbox'] = 'Block: Note';
$string['blocktype_wall'] = 'Block: Wall';
$string['blocktype_watchlist'] = 'Block: Watched pages';
$string['count_block_instance'] = 'Number of blocks';
......@@ -162,7 +163,7 @@ $string['plugin_blocktype_recentforumposts_version'] = 'Block type plugin Recent
$string['plugin_blocktype_recentposts_version'] = 'Block type plugin Recent journal posts version';
$string['plugin_blocktype_resumefield_version'] = 'Block type plugin Single résumé field version';
$string['plugin_blocktype_taggedposts_version'] = 'Block type plugin Tagged journal entries version';
$string['plugin_blocktype_textbox_version'] = 'Block type plugin Text box version';
$string['plugin_blocktype_textbox_version'] = 'Block type plugin Note version';
$string['plugin_blocktype_wall_version'] = 'Block type plugin Wall version';
$string['plugin_blocktype_watchlist_version'] = 'Block type plugin Watched pages version';
$string['plugin_export_html_version'] = 'Export plugin HTML version';
......
......@@ -414,9 +414,7 @@ $string['retractedonload'] = 'Automatically retract';
$string['retractedonloaddescription'] = 'Select to automatically retract this block.';
// Artefact chooser panel
$string['textbox'] = 'Text box';
$string['textboxtooltip'] = 'Add a text box';
$string['textbox1'] = 'Note';
$string['image'] = 'Image';
$string['imagetooltip'] = 'Add a single image';
$string['addcontent'] = 'Add Content';
$string['theme'] = 'Theme';
......@@ -3463,5 +3463,11 @@ function xmldb_core_upgrade($oldversion=0) {
AND NOT EXISTS (SELECT 1 FROM {institution} i WHERE i.name = {usr_registration}.institution)');
}
if ($oldversion < 2014081900) {
if ($data = check_upgrades('blocktype.text')) {
upgrade_plugin($data);
}
}
return $status;
}
......@@ -16,7 +16,7 @@ $config = new stdClass();
// See https://wiki.mahara.org/index.php/Developer_Area/Version_Numbering_Policy
// For upgrades on stable branches, increment the version by one. On master, use the date.
$config->version = 2014073100;
$config->version = 2014081900;
$config->release = '1.10.0dev';
$config->minupgradefrom = 2009022600;
$config->minupgraderelease = '1.1.0 (release tag 1.1.0_RELEASE)';
......
......@@ -5,9 +5,9 @@
{* If you are wanting to have some options always showing place the code here. *}
<div class="blocktype">
<a class="blocktypelink" href="#">
<input type="radio" class="blocktype-radio" id="blocktype-radio-textbox" name="blocktype" value="textbox">
<img width="24" height="24" title="{str tag=description section=blocktype.internal/textbox}" alt="{str tag=description section=blocktype.internal/textbox}" src="{$WWWROOT}thumb.php?type=blocktype&bt=textbox&ap=internal">
<label for="blocktype-radio-textbox" class="blocktypetitle">{str tag='textbox' section='view'}</label>
<input type="radio" class="blocktype-radio" id="blocktype-radio-text" name="blocktype" value="text">
<img width="24" height="24" title="{str tag=description section=blocktype.text}" alt="{str tag=description section=blocktype.text}" src="{$WWWROOT}thumb.php?type=blocktype&bt=text">
<label for="blocktype-radio-text" class="blocktypetitle">{str tag='title' section='blocktype.text'}</label>
</a>
</div>
<div class="blocktype lastrow">
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment