Fixed bug #15537: Rename "Shortcuts" to "Bookmarks"
authorSteffen Gebert <steffen.gebert@typo3.org>
Thu, 4 Nov 2010 16:51:21 +0000 (16:51 +0000)
committerSteffen Gebert <steffen.gebert@typo3.org>
Thu, 4 Nov 2010 16:51:21 +0000 (16:51 +0000)
git-svn-id: https://svn.typo3.org/TYPO3v4/Core/trunk@9277 709f56b5-9817-0410-a4d7-c38de5d9e867

ChangeLog
typo3/alt_db_navframe.php
typo3/alt_shortcut.php
typo3/classes/class.shortcutmenu.php
typo3/classes/class.workspaceselector.php
typo3/js/shortcutmenu.js
typo3/sysext/lang/locallang_core.xml
typo3/sysext/lang/locallang_csh_be_groups.xml
typo3/sysext/lang/locallang_csh_corebe.xml
typo3/sysext/lang/locallang_misc.xml
typo3/template.php

index 4cc0c5e..46ae92a 100755 (executable)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2010-11-04  Steffen Gebert  <steffen@steffen-gebert.de>
+
+       * Fixed bug #15537: Rename "Shortcuts" to "Bookmarks"
+
 2010-11-04  Xavier Perseguers  <typo3@perseguers.ch>
 
        * Fixed bug #15656: indexed_search: Template corrections of #14130 not applied to the CSS template (Thanks to Lorenz Ulrich)
index e572c13..bdcc400 100644 (file)
@@ -320,10 +320,10 @@ class SC_alt_db_navframe {
                if ($GLOBALS['BE_USER']->workspace!==0 || $GLOBALS['BE_USER']->getTSConfigVal('options.pageTree.onlineWorkspaceInfo'))  {
                        switch($GLOBALS['BE_USER']->workspace)  {
                                case 0:
-                                       $wsTitle = '&nbsp;'.$this->doc->icons(2).'['.$LANG->sL('LLL:EXT:lang/locallang_misc.xml:shortcut_onlineWS',1).']';
+                                       $wsTitle = '&nbsp;'.$this->doc->icons(2).'['.$LANG->sL('LLL:EXT:lang/locallang_misc.xml:bookmark_onlineWS',1).']';
                                break;
                                case -1:
-                                       $wsTitle = '['.$LANG->sL('LLL:EXT:lang/locallang_misc.xml:shortcut_offlineWS',1).']';
+                                       $wsTitle = '['.$LANG->sL('LLL:EXT:lang/locallang_misc.xml:bookmark_offlineWS',1).']';
                                break;
                                default:
                                        $wsTitle = '['.$GLOBALS['BE_USER']->workspace.'] '.htmlspecialchars($GLOBALS['BE_USER']->workspaceRec['title']);
index 94d7448..07cfbad 100644 (file)
@@ -367,10 +367,10 @@ class SC_alt_shortcut {
                                        }
 
                                        if ($sc_group>=0)       {
-                                               $onC = 'if (confirm('.$GLOBALS['LANG']->JScharCode($LANG->getLL('shortcut_delAllInCat')).')){window.location.href=\'alt_shortcut.php?deleteCategory='.$sc_group.'\';}return false;';
-                                               $this->linesPre[]='<td>&nbsp;</td><td class="bgColor5"><a href="#" onclick="'.htmlspecialchars($onC).'" title="'.$LANG->getLL('shortcut_delAllInCat',1).'">'.$label.'</a></td>';
+                                               $onC = 'if (confirm('.$GLOBALS['LANG']->JScharCode($LANG->getLL('bookmark_delAllInCat')).')){window.location.href=\'alt_shortcut.php?deleteCategory='.$sc_group.'\';}return false;';
+                                               $this->linesPre[]='<td>&nbsp;</td><td class="bgColor5"><a href="#" onclick="'.htmlspecialchars($onC).'" title="'.$LANG->getLL('bookmark_delAllInCat',1).'">'.$label.'</a></td>';
                                        } else {
-                                               $label = $LANG->getLL('shortcut_global',1).': '.($label ? $label : abs($sc_group));     // Fallback label
+                                               $label = $LANG->getLL('bookmark_global',1).': '.($label ? $label : abs($sc_group));     // Fallback label
                                                $this->lines[]='<td>&nbsp;</td><td class="bgColor5">'.$label.'</td>';
                                        }
                                        unset($label);
@@ -386,7 +386,7 @@ class SC_alt_shortcut {
                        }
                        $titleA = $this->itemLabel($label,$row['module_name'],$row['M_module_name']);
 
-                       $editSH = ($row['sc_group']>=0 || $BE_USER->isAdmin()) ? 'editSh('.intval($row['uid']).');' : "alert('".$LANG->getLL('shortcut_onlyAdmin')."')";
+                       $editSH = ($row['sc_group']>=0 || $BE_USER->isAdmin()) ? 'editSh('.intval($row['uid']).');' : "alert('".$LANG->getLL('bookmark_onlyAdmin')."')";
                        $jumpSC = 'jump(unescape(\''.rawurlencode($row['url']).'\'),\''.implode('_',$mParts).'\',\''.$mParts[0].'\');';
                        $onC = 'if (document.shForm.editShortcut_check && document.shForm.editShortcut_check.checked){'.$editSH.'}else{'.$jumpSC.'}return false;';
                        if ($sc_group>=0)       {       // user defined groups show up first
@@ -401,21 +401,21 @@ class SC_alt_shortcut {
                        $formerGr=$row['sc_group'];
                }
                ksort($this->selOpt);
-               array_unshift($this->selOpt,'<option>['.$LANG->getLL('shortcut_selSC',1).']</option>');
+               array_unshift($this->selOpt,'<option>['.$LANG->getLL('bookmark_selSC',1).']</option>');
 
                $this->editLoadedFunc();
                $this->editPageIdFunc();
 
                if (!$this->editLoaded && t3lib_extMgm::isLoaded('cms'))        {
-                               $editIdCode = '<td nowrap="nowrap">'.$LANG->getLL('shortcut_editID',1).': <input type="text" value="'.($this->editError?htmlspecialchars($this->editPage):'').'" name="editPage"'.$this->doc->formWidth(15).' onchange="submitEditPage(this.value);" />'.
+                               $editIdCode = '<td nowrap="nowrap">'.$LANG->getLL('bookmark_editID',1).': <input type="text" value="'.($this->editError?htmlspecialchars($this->editPage):'').'" name="editPage"'.$this->doc->formWidth(15).' onchange="submitEditPage(this.value);" />'.
                                        ($this->editError?'&nbsp;<strong><span class="typo3-red">'.htmlspecialchars($this->editError).'</span></strong>':'').
-                                       (is_array($this->theEditRec)?'&nbsp;<strong>'.$LANG->getLL('shortcut_loadEdit',1).' \''.t3lib_BEfunc::getRecordTitle('pages',$this->theEditRec,TRUE).'\'</strong> ('.htmlspecialchars($this->editPath).')':'').
-                                       ($this->searchFor?'&nbsp;'.$LANG->getLL('shortcut_searchFor',1).' <strong>\''.htmlspecialchars($this->searchFor).'\'</strong>':'').
+                                       (is_array($this->theEditRec)?'&nbsp;<strong>'.$LANG->getLL('bookmark_loadEdit',1).' \''.t3lib_BEfunc::getRecordTitle('pages',$this->theEditRec,TRUE).'\'</strong> ('.htmlspecialchars($this->editPath).')':'').
+                                       ($this->searchFor?'&nbsp;'.$LANG->getLL('bookmark_searchFor',1).' <strong>\''.htmlspecialchars($this->searchFor).'\'</strong>':'').
                                        '</td>';
                } else $editIdCode = '';
 
                        // Adding CSH:
-               $editIdCode.= '<td>&nbsp;'.t3lib_BEfunc::cshItem('xMOD_csh_corebe', 'shortcuts', $GLOBALS['BACK_PATH'],'',TRUE).'</td>';
+               $editIdCode.= '<td>&nbsp;'.t3lib_BEfunc::cshItem('xMOD_csh_corebe', 'bookmarks', $GLOBALS['BACK_PATH'],'',TRUE).'</td>';
 
                        // Compile it all:
                $this->content.='
@@ -488,8 +488,8 @@ class SC_alt_shortcut {
                                if ($v && strcmp('1',$v))       {
                                        $label = $v;
                                } else {
-                                       $label = $LANG->getLL('shortcut_group_'.$k,1);
-                                       if (!$label)    $label = $LANG->getLL('shortcut_group',1).' '.$k;       // Fallback label
+                                       $label = $LANG->getLL('bookmark_group_'.$k,1);
+                                       if (!$label)    $label = $LANG->getLL('bookmark_group',1).' '.$k;       // Fallback label
                                }
                                $opt[]='<option value="'.$k.'"'.(!strcmp($this->editSC_rec['sc_group'],$k)?' selected="selected"':'').'>'.$label.'</option>';
                        }
@@ -499,14 +499,14 @@ class SC_alt_shortcut {
                                        if ($v && strcmp('1',$v))       {
                                                $label = $v;
                                        } else {
-                                               $label = $LANG->getLL('shortcut_group_'.$k,1);
-                                               if (!$label)    $label = $LANG->getLL('shortcut_group',1).' '.$k;       // Fallback label
+                                               $label = $LANG->getLL('bookmark_group_'.$k,1);
+                                               if (!$label)    $label = $LANG->getLL('bookmark_group',1).' '.$k;       // Fallback label
                                        }
-                                       $label = $LANG->getLL('shortcut_global',1).': '.$label; // Add a prefix for global groups
+                                       $label = $LANG->getLL('bookmark_global',1).': '.$label; // Add a prefix for global groups
 
                                        $opt[]='<option value="-'.$k.'"'.(!strcmp($this->editSC_rec['sc_group'],'-'.$k)?' selected="selected"':'').'>'.$label.'</option>';
                                }
-                               $opt[]='<option value="-100"'.(!strcmp($this->editSC_rec['sc_group'],'-100')?' selected="selected"':'').'>'.$LANG->getLL('shortcut_global',1).': '.$LANG->getLL('shortcut_all',1).'</option>';
+                               $opt[]='<option value="-100"'.(!strcmp($this->editSC_rec['sc_group'],'-100')?' selected="selected"':'').'>'.$LANG->getLL('bookmark_global',1).': '.$LANG->getLL('bookmark_all',1).'</option>';
                        }
 
                                // border="0" hspace="2" width="21" height="16" - not XHTML compliant in <input type="image" ...>
@@ -519,9 +519,9 @@ class SC_alt_shortcut {
                                        <tr>
                                                <td>&nbsp;&nbsp;</td>
                                                <td><input type="image" class="c-inputButton" name="_savedok"'.t3lib_iconWorks::skinImg($this->doc->backPath,'gfx/savedok.gif','').' title="'.$LANG->getLL('shortcut_save',1).'" /></td>
-                                               <td><input type="image" class="c-inputButton" name="_saveclosedok"'.t3lib_iconWorks::skinImg($this->doc->backPath,'gfx/saveandclosedok.gif','').' title="'.$LANG->getLL('shortcut_saveClose',1).'" /></td>
-                                               <td><input type="image" class="c-inputButton" name="_closedok"'.t3lib_iconWorks::skinImg($this->doc->backPath,'gfx/closedok.gif','').' title="'.$LANG->getLL('shortcut_close',1).'" /></td>
-                                               <td><input type="image" class="c-inputButton" name="_deletedok"'.t3lib_iconWorks::skinImg($this->doc->backPath,'gfx/deletedok.gif','').' title="'.$LANG->getLL('shortcut_delete',1).'" /></td>
+                                               <td><input type="image" class="c-inputButton" name="_saveclosedok"'.t3lib_iconWorks::skinImg($this->doc->backPath,'gfx/saveandclosedok.gif','').' title="'.$LANG->getLL('bookmark_saveClose',1).'" /></td>
+                                               <td><input type="image" class="c-inputButton" name="_closedok"'.t3lib_iconWorks::skinImg($this->doc->backPath,'gfx/closedok.gif','').' title="'.$LANG->getLL('bookmark_close',1).'" /></td>
+                                               <td><input type="image" class="c-inputButton" name="_deletedok"'.t3lib_iconWorks::skinImg($this->doc->backPath,'gfx/deletedok.gif','').' title="'.$LANG->getLL('bookmark_delete',1).'" /></td>
                                                <td><input name="editName" type="text" value="'.htmlspecialchars($this->editSC_rec['description']).'"'.$this->doc->formWidth(15).' /></td>
                                                <td><select name="editGroup">'.implode('',$opt).'</select></td>
                                        </tr>
@@ -541,7 +541,7 @@ class SC_alt_shortcut {
 
                if (count($this->lines))        {
                        if (!$BE_USER->getTSConfigVal('options.mayNotCreateEditShortcuts'))     {
-                               $this->lines=array_merge(array('<td><input type="checkbox" id="editShortcut_check" name="editShortcut_check" value="1"'.($this->editSC?' checked="checked"':'').' /> <label for="editShortcut_check">'.$LANG->getLL('shortcut_edit',1).'</label>&nbsp;</td>'),$this->lines);
+                               $this->lines=array_merge(array('<td><input type="checkbox" id="editShortcut_check" name="editShortcut_check" value="1"'.($this->editSC?' checked="checked"':'').' /> <label for="editShortcut_check">'.$LANG->getLL('bookmark_edit',1).'</label>&nbsp;</td>'),$this->lines);
                                $this->lines[]='<td>'.$manageForm.'</td>';
                        }
                        $this->lines[]='<td><img src="clear.gif" width="10" height="1" alt="" /></td>';
@@ -586,7 +586,7 @@ class SC_alt_shortcut {
                                        $this->searchFor = $this->editPage;
                                } elseif (!$BE_USER->isInWebMount($this->theEditRec['uid'])) {
                                        unset($this->theEditRec);
-                                       $this->editError=$LANG->getLL('shortcut_notEditable');
+                                       $this->editError=$LANG->getLL('bookmark_notEditable');
                                } else {
 
                                                // Visual path set:
@@ -685,10 +685,10 @@ class SC_alt_shortcut {
                        // Create options array:
                $options = array();
                if ($BE_USER->checkWorkspace(array('uid' => 0)))        {
-                       $options[0] = '['.$LANG->getLL('shortcut_onlineWS').']';
+                       $options[0] = '['.$LANG->getLL('bookmark_onlineWS').']';
                }
                if ($BE_USER->checkWorkspace(array('uid' => -1)))       {
-                       $options[-1] = '['.$LANG->getLL('shortcut_offlineWS').']';
+                       $options[-1] = '['.$LANG->getLL('bookmark_offlineWS').']';
                }
 
                        // Add custom workspaces (selecting all, filtering by BE_USER check):
@@ -708,7 +708,7 @@ class SC_alt_shortcut {
                                $options[$value] = '<option value="'.htmlspecialchars($value).'"'.$selected.'>'.htmlspecialchars($label).'</option>';
                        }
                } else {
-                       $options[] = '<option value="-99">'.$LANG->getLL('shortcut_noWSfound',1).'</option>';
+                       $options[] = '<option value="-99">'.$LANG->getLL('bookmark_noWSfound',1).'</option>';
                }
 
                $selector = '';
index 9294f93..094bbb1 100644 (file)
@@ -111,7 +111,7 @@ class ShortcutMenu implements backend_toolbarItem {
         * @return      string          workspace selector as HTML select
         */
        public function render() {
-               $title = $GLOBALS['LANG']->sL('LLL:EXT:lang/locallang_core.xml:toolbarItems.shortcuts', true);
+               $title = $GLOBALS['LANG']->sL('LLL:EXT:lang/locallang_core.xml:toolbarItems.bookmarks', true);
                $this->addJavascriptToBackend();
 
                $shortcutMenu = array();
@@ -133,9 +133,9 @@ class ShortcutMenu implements backend_toolbarItem {
         */
        public function renderMenu() {
 
-               $shortcutGroup  = $GLOBALS['LANG']->sL('LLL:EXT:lang/locallang_core.xml:toolbarItems.shortcutsGroup', true);
-               $shortcutEdit   = $GLOBALS['LANG']->sL('LLL:EXT:lang/locallang_core.xml:toolbarItems.shortcutsEdit', true);
-               $shortcutDelete = $GLOBALS['LANG']->sL('LLL:EXT:lang/locallang_core.xml:toolbarItems.shortcutsDelete', true);
+               $shortcutGroup  = $GLOBALS['LANG']->sL('LLL:EXT:lang/locallang_core.xml:toolbarItems.bookmarksGroup', true);
+               $shortcutEdit   = $GLOBALS['LANG']->sL('LLL:EXT:lang/locallang_core.xml:toolbarItems.bookmarksEdit', true);
+               $shortcutDelete = $GLOBALS['LANG']->sL('LLL:EXT:lang/locallang_core.xml:toolbarItems.bookmarksDelete', true);
 
                $groupIcon  = '<img'.t3lib_iconWorks::skinImg($this->backPath, 'gfx/i/sysf.gif', 'width="18" height="16"').' title="'.$shortcutGroup.'" alt="'.$shortcutGroup.'" />';
                $editIcon   = '<img'.t3lib_iconWorks::skinImg($this->backPath, 'gfx/edit2.gif', 'width="11" height="12"').' title="'.$shortcutEdit.'" alt="'.$shortcutEdit.'"';
@@ -196,11 +196,11 @@ class ShortcutMenu implements backend_toolbarItem {
 
                if(count($shortcutMenu) == 1) {
                                //no shortcuts added yet, show a small help message how to add shortcuts
-                       $title = $GLOBALS['LANG']->sL('LLL:EXT:lang/locallang_core.xml:toolbarItems.shortcuts', true);
+                       $title = $GLOBALS['LANG']->sL('LLL:EXT:lang/locallang_core.xml:toolbarItems.bookmarks', true);
                        $icon = t3lib_iconWorks::getSpriteIcon('actions-system-shortcut-new', array(
                                'title' => $title
                        ));
-                       $label = str_replace('%icon%', $icon, $GLOBALS['LANG']->sL('LLL:EXT:lang/locallang_misc.php:shortcutDescription'));
+                       $label = str_replace('%icon%', $icon, $GLOBALS['LANG']->sL('LLL:EXT:lang/locallang_misc.php:bookmarkDescription'));
 
                        $shortcutMenu[] = '<tr><td style="padding:1px 2px; color: #838383;">'.$label.'</td></tr>';
                }
@@ -411,24 +411,24 @@ class ShortcutMenu implements backend_toolbarItem {
                        $label = $groupLabel;
 
                        if($groupLabel == '1') {
-                               $label = $GLOBALS['LANG']->getLL('shortcut_group_'.abs($groupId), 1);
+                               $label = $GLOBALS['LANG']->getLL('bookmark_group_'.abs($groupId), 1);
 
                                if(empty($label)) {
                                                // fallback label
-                                       $label = $GLOBALS['LANG']->getLL('shortcut_group', 1).' '.abs($groupId);
+                                       $label = $GLOBALS['LANG']->getLL('bookmark_group', 1).' '.abs($groupId);
                                }
                        }
 
                        if($groupId < 0) {
                                        // global group
-                               $label = $GLOBALS['LANG']->getLL('shortcut_global', 1).': '.
+                               $label = $GLOBALS['LANG']->getLL('bookmark_global', 1).': '.
                                        (!empty($label) ?
                                                $label :
                                                abs($groupId)
                                        );
 
                                if($groupId == -100) {
-                                       $label = $GLOBALS['LANG']->getLL('shortcut_global', 1).': '.$GLOBALS['LANG']->getLL('shortcut_all', 1);
+                                       $label = $GLOBALS['LANG']->getLL('bookmark_global', 1).': '.$GLOBALS['LANG']->getLL('bookmark_all', 1);
                                }
                        }
 
index e0924f7..133d4e9 100644 (file)
@@ -146,10 +146,10 @@ class WorkspaceSelector implements backend_toolbarItem {
 
                        // add default workspaces
                if($GLOBALS['BE_USER']->checkWorkspace(array('uid' => 0))) {
-                       $availableWorkspaces[0] = '['.$GLOBALS['LANG']->getLL('shortcut_onlineWS').']';
+                       $availableWorkspaces[0] = '['.$GLOBALS['LANG']->getLL('bookmark_onlineWS').']';
                }
                if ($GLOBALS['BE_USER']->checkWorkspace(array('uid' => -1))) {
-                       $availableWorkspaces[-1] = '['.$GLOBALS['LANG']->getLL('shortcut_offlineWS').']';
+                       $availableWorkspaces[-1] = '['.$GLOBALS['LANG']->getLL('bookmark_offlineWS').']';
                }
 
                        // add custom workspaces (selecting all, filtering by BE_USER check):
@@ -186,7 +186,7 @@ class WorkspaceSelector implements backend_toolbarItem {
                $stateCheckedIcon = t3lib_iconWorks::getSpriteIcon('status-status-checked');
 
                $stateUncheckedIcon = t3lib_iconWorks::getSpriteIcon('empty-empty', array(
-                       'title' => $GLOBALS['LANG']->getLL('shortcut_inactive')
+                       'title' => $GLOBALS['LANG']->getLL('bookmark_inactive')
                ));
 
                $workspaceMenu[] = '<a href="#" class="toolbar-item">' .
@@ -210,7 +210,7 @@ class WorkspaceSelector implements backend_toolbarItem {
                        }
                } else {
                        $workspaceMenu[] = '<li>' . $stateUncheckedIcon . ' ' .
-                               $GLOBALS['LANG']->getLL('shortcut_noWSfound', true) .
+                               $GLOBALS['LANG']->getLL('bookmark_noWSfound', true) .
                                '</li>';
                }
 
@@ -223,12 +223,12 @@ class WorkspaceSelector implements backend_toolbarItem {
                $workspaceMenu[] = '<li class="divider">' . $frontendPreviewActiveIcon .
                        '<a href="backend.php?changeWorkspacePreview=' .
                        ($GLOBALS['BE_USER']->user['workspace_preview'] ? '0' : '1') .
-                       '" id="frontendPreviewToggle">' . $GLOBALS['LANG']->getLL('shortcut_FEPreview', true) . '</a></li>';
+                       '" id="frontendPreviewToggle">' . $GLOBALS['LANG']->getLL('bookmark_FEPreview', true) . '</a></li>';
 
                        // go to workspace module link
                $workspaceMenu[] = '<li>' . $stateUncheckedIcon . ' ' .
                        '<a href="' . t3lib_extMgm::extRelPath('version') . 'ws/index.php" target="content" id="goToWsModule">' .
-                       ' '. $GLOBALS['LANG']->getLL('shortcut_workspace', true) . '</a></li>';
+                       ' '. $GLOBALS['LANG']->getLL('bookmark_workspace', true) . '</a></li>';
 
                $workspaceMenu[] = '</ul>';
 
index 374f639..668cb17 100644 (file)
@@ -86,7 +86,7 @@ var ShortcutMenu = Class.create({
                        // activate delete icon
                $$('.shortcut-delete img').each(function(element) {
                        element.observe('click', function(event) {
-                               if (confirm('Do you really want to remove this shortcut?')) {
+                               if (confirm('Do you really want to remove this bookmark?')) {
                                        var deleteControl = event.element();
                                        var shortcutId = deleteControl.up('tr.shortcut').identify().slice(9);
 
index 56eb415..b43f30a 100755 (executable)
@@ -9,6 +9,7 @@
                        <label index="labels.openInNewWindow">Open in new window</label>
                        <label index="labels.goBack">Go back</label>
                        <label index="labels.makeShortcut">Create a shortcut to this page?</label>
+                       <label index="labels.makeBookmark">Create a bookmark to this page</label>
                        <label index="labels.lockedRecord">The user '%s' began to edit this record %s ago.</label>
                        <label index="labels.lockedRecord_content">The user '%s' began to edit content on this page %s ago.</label>
                        <label index="labels.lockedRecordUser">The %s '%s' began to edit this record %s ago.</label>
@@ -270,6 +271,11 @@ Would you like to save now in order to refresh the display?</label>
                        <label index="toolbarItems.shortcutsGroup">Shortcut Group</label>
                        <label index="toolbarItems.shortcutsEdit">Edit Shortcut</label>
                        <label index="toolbarItems.shortcutsDelete">Delete Shortcut</label>
+                       <label index="toolbarItems.bookmarks">Bookmarks</label>
+                       <label index="toolbarItems.bookmark">Bookmark</label>
+                       <label index="toolbarItems.bookmarksGroup">Bookmark group</label>
+                       <label index="toolbarItems.bookmarksEdit">Edit bookmark</label>
+                       <label index="toolbarItems.bookmarksDelete">Delete bookmark</label>
                        <label index="toolbarItems.search">Search</label>
                        <label index="toolbarItems.workspace">Workspace</label>
                        <label index="tabs.closeAll">Close All Tabs</label>
index f38eb13..88d6f4e 100755 (executable)
@@ -124,7 +124,7 @@ be_groups:non_exclude_fields</label>
                        <label index="description.description">Enter a short description of the user group, what it is for and who should be members. This is for internal use only.</label>
                        <label index="_description.seeAlso">fe_groups:description</label>
                        <label index="TSconfig.description">User TSconfig: Additional configuration through TypoScript style values (Advanced).</label>
-                       <label index="TSconfig.details">User TSconfig can be set for each backend user and group. Configuration set for backend groups is inherited by the user who is a member of those groups. The available options typically cover user settings like those found in the User&gt;Setup module (in fact options from that module can be forcibly overridden from User TSconfig!), configuration of the &quot;Admin Panel&quot; (frontend), various backend tweaks (lock user to IP, show shortcut frame, may user clear all cache?, width of the navigation frame etc.) and backend module configuration (overriding any configuration set for backend modules in Page TSconfig).</label>
+                       <label index="TSconfig.details">User TSconfig can be set for each backend user and group. Configuration set for backend groups is inherited by the user who is a member of those groups. The available options typically cover user settings like those found in the User&gt;Setup module (in fact options from that module can be forcibly overridden from User TSconfig!), configuration of the &quot;Admin Panel&quot; (frontend), various backend tweaks (lock user to IP, may user clear all cache?, width of the navigation frame etc.) and backend module configuration (overriding any configuration set for backend modules in Page TSconfig).</label>
                        <label index="TSconfig.syntax">TypoScript syntax without conditions and constants.</label>
                        <label index="_TSconfig.seeAlso">be_users:TSconfig
 fe_users:TSconfig
index f7dc08d..003462f 100755 (executable)
@@ -439,6 +439,18 @@ EXT:lang/cshimages/core_68.png,</label>
 You will have to confirm the creation of the shortcut. It is nothing dangerous - only annoying to clean up if you happen to create shortcuts against your own will. Just answer &quot;OK&quot; here.
 When you answer &quot;OK&quot; you should immediately see the shortcut frame reload and a new icon (the module icon) appear. If you click this icon you will now jump to the page you created the shortcut from!
 You can name shortcuts, you can even group them and share them. If you want to edit or delete a shortcut you select the &quot;Edit&quot; checkbox and then click the shortcut icon. This will reload the shortcut frame so you get a field for entering a title. You can also delete all shortcuts in a &quot;group&quot; - here, just click the &quot;0&quot; (zero) to the left of the icons and you will remove all shortcuts in the group.</label>
+                       <label index="bookmarks.alttitle">Backend Bookmarks</label>
+                       <label index="bookmarks.description">You can create bookmarks to modules in TYPO3 quite easily. The treat is that you can jump between screens in TYPO3 in &lt;em&gt;one&lt;/em&gt; click rather than multiple clicks through backend modules etc. The frame also contains a field for entering a page or record id to edit or just search records.</label>
+                       <label index="bookmarks.details">In order to create a bookmark it must be supported by the module you want to create the bookmark to. Whether bookmarks are supported can be seen in the top of a module. If there is a small star icon you can click it to create the bookmark.</label>
+                       <label index="_bookmarks.seeAlso">User TSconfig -&gt;SETUP | http://typo3.org/documentation/document-library/doc_core_tsconfig/OPTIONS/</label>
+                       <label index="_bookmarks.image">EXT:lang/cshimages/core_64.png,
+EXT:lang/cshimages/core_65.png,
+EXT:lang/cshimages/core_67.png,
+EXT:lang/cshimages/core_68.png,</label>
+                       <label index="bookmarks.image_descr">To create a bookmark to a page, just click the star icon usually found in the top of pages.
+You will have to confirm the creation of the bookmark. It is nothing dangerous - only annoying to clean up if you happen to create bookmarks against your own will. Just answer &quot;OK&quot; here.
+When you answer &quot;OK&quot; you should immediately see the bookmark icon in the toolbar reloading and, after opening the menu, the new entry appear. If you click this entry, you will now jump to the page you created the bookmark from!
+You can name bookmarks, you can even group them and share them. If you want to edit or delete a bookmark you select the &quot;Edit&quot; checkbox and then click the bookmark icon.</label>
                        <label index="workspaceSelector.alttitle">Workspace Selector</label>
                        <label index="workspaceSelector.description">By this selectorbox you can switch between the workspaces available to you. When you switch workspace the whole backend will reload.</label>
                        <label index="workspaceSelector.details">There are two basic workspace types in TYPO3: The &quot;Live&quot; workspace and a number of &quot;Draft&quot; workspaces.
index 53d7528..a5052a3 100755 (executable)
                        <label index="shortcut_noWSfound">ERROR: No workspaces found!</label>
                        <label index="shortcut_FEPreview">Enable Frontend Preview</label>
                        <label index="shortcut_workspace">Go to Workspace Module</label>
+                       <label index="bookmarkDescription">This is the bookmarks menu. You do not have any bookmarks added yet, you can do so by clicking the bookmark icon %icon%, which you can find on each page in the backend.</label>
+                       <label index="bookmark_edit">Edit</label>
+                       <label index="bookmark_create">Create</label>
+                       <label index="bookmark_editID">Edit/Search</label>
+                       <label index="bookmark_save">Update bookmark title</label>
+                       <label index="bookmark_saveClose">Update and close editor</label>
+                       <label index="bookmark_close">Close bookmark editor</label>
+                       <label index="bookmark_delete">Remove bookmark</label>
+                       <label index="bookmark_loadEdit">Loading page</label>
+                       <label index="bookmark_searchFor">Search for:</label>
+                       <label index="bookmark_notEditable">No editable page found!</label>
+                       <label index="bookmark_group">Group</label>
+                       <label index="bookmark_group_1">Pages</label>
+                       <label index="bookmark_group_2">Records</label>
+                       <label index="bookmark_group_3">Files</label>
+                       <label index="bookmark_group_4">Tools</label>
+                       <label index="bookmark_group_5">Miscellaneous</label>
+                       <label index="bookmark_global">Global</label>
+                       <label index="bookmark_all">All</label>
+                       <label index="bookmark_onlyAdmin">You cannot edit a shared bookmark!</label>
+                       <label index="bookmark_selSC">Select bookmark</label>
+                       <label index="bookmark_delAllInCat">Delete all bookmarks in this group</label>
+                       <label index="bookmark_onlineWS">LIVE workspace</label>
+                       <label index="bookmark_offlineWS">Draft workspace</label>
+                       <label index="bookmark_active">active</label>
+                       <label index="bookmark_inactive">inactive</label>
+                       <label index="bookmark_noWSfound">ERROR: No workspaces found!</label>
+                       <label index="bookmark_FEPreview">Enable Frontend Preview</label>
+                       <label index="bookmark_workspace">Go to Workspace Module</label>
                        <label index="overwriteExistingFiles">Overwrite existing files</label>
                        <label index="selectPosition">Select a position for the new page</label>
                        <label index="pageSelectPosition">Page (select position)</label>
index 75cf7a6..bc74bb3 100644 (file)
@@ -512,13 +512,13 @@ class template {
                } else $mMN='';
 
                $onClick = 'top.ShortcutManager.createShortcut('
-                       .$GLOBALS['LANG']->JScharCode($GLOBALS['LANG']->sL('LLL:EXT:lang/locallang_core.php:labels.makeShortcut')).', '
+                       .$GLOBALS['LANG']->JScharCode($GLOBALS['LANG']->sL('LLL:EXT:lang/locallang_core.php:labels.makeBookmark')).', '
                        .'\''.$backPath.'\', '
                        .'\''.rawurlencode($modName).'\', '
                        .'\''.rawurlencode($pathInfo['path']."?".$storeUrl).$mMN.'\''
                .');return false;';
 
-               $sIcon = '<a href="#" onclick="' . htmlspecialchars($onClick).'" title="' . $GLOBALS['LANG']->sL('LLL:EXT:lang/locallang_core.php:labels.makeShortcut', TRUE) . '">'
+               $sIcon = '<a href="#" onclick="' . htmlspecialchars($onClick).'" title="' . $GLOBALS['LANG']->sL('LLL:EXT:lang/locallang_core.php:labels.makeBookmark', TRUE) . '">'
                        . t3lib_iconworks::getSpriteIcon('actions-system-shortcut-new') . '</a>';
                return $sIcon;
        }
@@ -2206,4 +2206,4 @@ if (defined('TYPO3_MODE') && $TYPO3_CONF_VARS[TYPO3_MODE]['XCLASS']['typo3/templ
 $GLOBALS['TBE_TEMPLATE'] = t3lib_div::makeInstance('template');
 
 
-?>
\ No newline at end of file
+?>