Goobi.Presentation

Merge lp:~sebastian-meyer/goobi-presentation/bug918587 into lp:goobi-presentation/1.1

  1. bug918587
  2. Merge into 1.1
Proposed by Sebastian Meyer
Status: Merged
Merged at revision: 65
Proposed branch: lp:~sebastian-meyer/goobi-presentation/bug918587
Merge into: lp:goobi-presentation/1.1
Diff against target: 69 lines (+3/-9)
4 files modified
dlf/ext_localconf.php (+2/-2)
dlf/plugins/toolbox/class.tx_dlf_toolbox.php (+1/-4)
dlf/plugins/toolbox/locallang.xml (+0/-2)
dlf/plugins/toolbox/template.tmpl (+0/-1)
To merge this branch: bzr merge lp:~sebastian-meyer/goobi-presentation/bug918587
Reviewer Review Type Date Requested Status
Sebastian Meyer Approve
Review via email: mp+98163@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Sebastian Meyer (sebastian-meyer) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'dlf/ext_localconf.php'
2--- dlf/ext_localconf.php 2011-11-11 14:48:17 +0000
3+++ dlf/ext_localconf.php 2012-03-19 08:31:32 +0000
4@@ -48,11 +48,11 @@
5 t3lib_extMgm::addPItoST43($_EXTKEY, 'plugins/toolbox/class.tx_dlf_toolbox.php', '_toolbox', 'list_type', FALSE);
6
7 // Register tools for toolbox plugin.
8-t3lib_extMgm::addPItoST43($_EXTKEY, 'plugins/toolbox/tools/dfgviewer/class.tx_dlf_toolsDfgviewer.php', '_toolsDfgviewer', 'includeLib', FALSE);
9+t3lib_extMgm::addPItoST43($_EXTKEY, 'plugins/toolbox/tools/dfgviewer/class.tx_dlf_toolsDfgviewer.php', '_toolsDfgviewer', '', FALSE);
10
11 $GLOBALS['TYPO3_CONF_VARS']['SC_OPTIONS']['dlf/plugins/toolbox/tools'][t3lib_extMgm::getCN($_EXTKEY).'_toolsDfgviewer'] = 'LLL:EXT:dlf/locallang.xml:tx_dlf_toolbox.toolsDfgviewer';
12
13-t3lib_extMgm::addPItoST43($_EXTKEY, 'plugins/toolbox/tools/pdf/class.tx_dlf_toolsPdf.php', '_toolsPdf', 'includeLib', FALSE);
14+t3lib_extMgm::addPItoST43($_EXTKEY, 'plugins/toolbox/tools/pdf/class.tx_dlf_toolsPdf.php', '_toolsPdf', '', FALSE);
15
16 $GLOBALS['TYPO3_CONF_VARS']['SC_OPTIONS']['dlf/plugins/toolbox/tools'][t3lib_extMgm::getCN($_EXTKEY).'_toolsPdf'] = 'LLL:EXT:dlf/locallang.xml:tx_dlf_toolbox.toolsPdf';
17
18
19=== modified file 'dlf/plugins/toolbox/class.tx_dlf_toolbox.php'
20--- dlf/plugins/toolbox/class.tx_dlf_toolbox.php 2011-08-15 15:20:18 +0000
21+++ dlf/plugins/toolbox/class.tx_dlf_toolbox.php 2012-03-19 08:31:32 +0000
22@@ -74,9 +74,6 @@
23
24 }
25
26- // Set toolbox label.
27- $markerArray['###LABEL###'] = $this->pi_getLL('label', '', TRUE);
28-
29 // Build data array.
30 $data = array ();
31
32@@ -125,7 +122,7 @@
33
34 }
35
36- return $this->pi_wrapInBaseClass($this->cObj->substituteSubpart($this->cObj->substituteMarkerArray($this->template, $markerArray), '###TOOLS###', $content, TRUE));
37+ return $this->pi_wrapInBaseClass($this->cObj->substituteSubpart($this->template, '###TOOLS###', $content, TRUE));
38
39 }
40
41
42=== modified file 'dlf/plugins/toolbox/locallang.xml'
43--- dlf/plugins/toolbox/locallang.xml 2011-04-01 15:53:16 +0000
44+++ dlf/plugins/toolbox/locallang.xml 2012-03-19 08:31:32 +0000
45@@ -9,13 +9,11 @@
46 <label index="tt_content.pi_flexform.sheet_general">Options</label>
47 <label index="tt_content.pi_flexform.tools">Tools</label>
48 <label index="tt_content.pi_flexform.templateFile">Template file</label>
49- <label index="label">Toolbox</label>
50 </languageKey>
51 <languageKey index="de" type="array">
52 <label index="tt_content.pi_flexform.sheet_general">Einstellungen</label>
53 <label index="tt_content.pi_flexform.tools">Werkzeuge</label>
54 <label index="tt_content.pi_flexform.templateFile">HTML-Template</label>
55- <label index="label">Werkzeugkasten</label>
56 </languageKey>
57 </data>
58 </T3locallang>
59\ No newline at end of file
60
61=== modified file 'dlf/plugins/toolbox/template.tmpl'
62--- dlf/plugins/toolbox/template.tmpl 2012-03-16 09:06:25 +0000
63+++ dlf/plugins/toolbox/template.tmpl 2012-03-19 08:31:32 +0000
64@@ -1,5 +1,4 @@
65 <!-- ###TEMPLATE### -->
66-<h2 class="tx-dlf-toolbox-label">###LABEL###</h2>
67 <ul>
68 <!-- ###TOOLS### -->
69 <li>###TOOL###</li>

Subscribers

People subscribed via source and target branches

to all changes: