Commit Graph

880 Commits

Author SHA1 Message Date
Sebastian Meyer a56a061c3e Merge pull request #115 from albig/add-newspaper-plugin
Optimize template rendering for newspaper year overview
2016-04-11 10:40:30 +02:00
Alexander Bigga c7edeaa1a4 add language labels for newspaper calendar/list view 2016-04-11 10:11:32 +02:00
Alexander Bigga 17c68ed710 changed markup of newspaper year view 2016-04-08 18:22:53 +02:00
Alexander Bigga 2be0d892e8 changed markup of newspaper calendar listview 2016-04-08 18:05:02 +02:00
Sebastian Meyer 2e67a594b5 Fixes small copy&paste errors in newspaper plugin 2016-04-01 09:57:27 +02:00
Sebastian Meyer c6d4d5e79b Merge pull request #109 from albig/add-newspaper-plugin
add plugin for newspaper presentation
2016-04-01 09:27:04 +02:00
Alexander Bigga 1e34f85927 fix label of newspapers in calendar view 2016-03-31 16:20:43 +02:00
Alexander Bigga f94e07ecdf add classes to newspaper plugin template 2016-03-31 15:28:29 +02:00
Alexander Bigga 010dcde000 Merge pull request #114 from jacmendt/fulltext-sru-bug
Add key in array check to tx_dlf_document.getTitledata function
2016-03-22 15:59:04 +01:00
Jacob Mendt feff2a5687 Add key in array check to tx_dlf_document.getTitledata function 2016-03-22 15:45:36 +01:00
Sebastian Meyer 3901515a06 Merge pull request #113 from stweil/master
Shorten the label for Goobi.Presentation in TYPO3 backend
2016-03-22 10:54:58 +01:00
Stefan Weil 186298b667 Shorten the label for Goobi.Presentation in TYPO3 backend
"Goobi.Presentation" is rather long - too long in the default width,
so it is only partially visible. Use a shorter label which fits
nicely.

Signed-off-by: Stefan Weil <sw@weilnetz.de>
2016-03-22 10:49:30 +01:00
Alexander Bigga c9bb00cae9 use title_sorting as fallback for volume_sorting for newspaper year anchor 2016-03-21 15:31:18 +01:00
Stefan Weil 0083ce89b0 Add missing 'var' for local JavaScript variable
This fixes a warning from PhpStorm.

Signed-off-by: Stefan Weil <sw@weilnetz.de>
2016-03-21 15:31:18 +01:00
Sebastian Meyer 7e9a021b87 Backport archival structures from DFG Viewer 2016-03-21 13:58:32 +01:00
Sebastian Meyer 52d4d1cd2b Merge pull request #112 from stweil/phpstorm
Add missing 'var' for local JavaScript variable
2016-03-21 10:10:56 +01:00
Stefan Weil 13e40c7d27 Add missing 'var' for local JavaScript variable
This fixes a warning from PhpStorm.

Signed-off-by: Stefan Weil <sw@weilnetz.de>
2016-03-18 19:11:34 +01:00
Alexander Bigga 3de38fd228 Disable entity loading like in TYPO3 core
With security patch "[SECURITY] XML entity expansion" in TYPO3 6.2 and
7.6 TYPO3/TYPO3.CMS@844369e9be the TYPO3
core disables the entity loading for external resources around every XML
parsing methods.

This not only disables the entity loading but also the loading of external
and local (!) resources completly.

As the setting of libxml_disable_entity_loader() is shared over threads,
the following PHP Warning happens in case of race conditions:

"PHP Warning: DOMDocument::load(): I/O warning : failed to load external
entity"

This patch does the respective change in Goobi.Presentation.
2016-03-11 16:44:46 +01:00
Jacob Mendt 8576885feb Reindex flexform for plugin pageview 2016-03-11 16:44:46 +01:00
Jacob Mendt ccee8c6427 Remove flexform entries for not supported ol3 controls 2016-03-11 16:44:46 +01:00
Jacob Mendt 6fd5dd39a0 Remove code regarding openlayers 2 localization loading 2016-03-11 16:44:46 +01:00
Jacob Mendt fa2c450c38 Save view parameters as cookies in case of flipping pages 2016-03-11 16:44:46 +01:00
Sebastian Meyer 54199dd13e Merge pull request #107 from jacmendt/ol3
Remove dead code and fix saving of map view parameters
2016-03-11 16:21:31 +01:00
Sebastian Meyer bce146e6ca Merge pull request #108 from albig/fix-xxe-loading-file
Disable entity loading like in TYPO3 core
2016-03-11 16:19:21 +01:00
Alexander Bigga 3750b5a483 Disable entity loading like in TYPO3 core
With security patch "[SECURITY] XML entity expansion" in TYPO3 6.2 and
7.6 TYPO3/TYPO3.CMS@844369e9be the TYPO3
core disables the entity loading for external resources around every XML
parsing methods.

This not only disables the entity loading but also the loading of external
and local (!) resources completly.

As the setting of libxml_disable_entity_loader() is shared over threads,
the following PHP Warning happens in case of race conditions:

"PHP Warning: DOMDocument::load(): I/O warning : failed to load external
entity"

This patch does the respective change in Goobi.Presentation.
2016-03-11 15:38:33 +01:00
Alexander Bigga 1371453f50 add plugin for newspaper presentation
Together with the document type switch, it's possible to replace the
content by this plugin. Other plugins will be removed by typoscript.

Views:
 1. tx_dlf_newspaper->years: shows all years of this newspaper (anchor)
 2. tx_dlf_newspaper->calendar: shows a calendar of one year

Typoscript:

plugin.tx_dlf_newspaper {
  pages = 4152
  targetPid = #
  template =
}

[userFunc = user_dlf_docTypeCheck(newspaper)]
web.1.marks.DLF {
  20 < plugin.tx_dlf_newspaper
  20.userFunc = tx_dlf_newspaper->years
}
[global]

[userFunc = user_dlf_docTypeCheck(year)]
page.1.marks.DLF {
  20 < plugin.tx_dlf_newspaper
  20.userFunc = tx_dlf_newspaper->calendar
}
[global]
2016-03-11 15:13:35 +01:00
Alexander Bigga b877ef4207 fix language label of error message in indexing module 2016-03-07 09:52:15 +01:00
Jacob Mendt d10db4dde8 Reindex flexform for plugin pageview 2016-03-04 14:59:58 +01:00
Jacob Mendt ca30337cd9 Remove flexform entries for not supported ol3 controls 2016-03-03 16:42:13 +01:00
Jacob Mendt dc586c072a Remove code regarding openlayers 2 localization loading 2016-03-03 16:36:47 +01:00
Jacob Mendt 18f6ea317e Save view parameters as cookies in case of flipping pages 2016-03-03 16:35:37 +01:00
Alexander Bigga 1b8005683c apply changes of cfda9d8c00 to dlf_hacks accordingly 2016-03-03 13:05:56 +01:00
Alexander Bigga 608b60c1ce merge upstream/master into master 2016-03-02 15:56:24 +01:00
Sebastian Meyer 9d19860bae Merge pull request #106 from stweil/master
Remove unused local variables (PhpStorm)
2016-02-26 09:11:04 +01:00
Stefan Weil 9746f1c052 tx_dlf_pageview: Remove unused local variable
This fixes a warning from PhpStorm.

Signed-off-by: Stefan Weil <sw@weilnetz.de>
2016-02-26 06:23:26 +01:00
Stefan Weil 8fb6f35ba1 tx_dlf_list: Remove unused local variable
This fixes a warning from PhpStorm.

Signed-off-by: Stefan Weil <sw@weilnetz.de>
2016-02-26 06:23:03 +01:00
Sebastian Meyer a8bfdea06a Traverse all parent structures when indexing 2016-02-24 18:02:43 +01:00
Sebastian Meyer 75083cf74d Fix some phpStorm hints 2016-02-24 18:00:55 +01:00
Sebastian Meyer e49b6c1a5a Use boolean operators in xpath predicates 2016-02-24 13:29:10 +01:00
Sebastian Meyer cfda9d8c00 Structure DIVs with MPTRs are never toplevel elements 2016-02-24 11:27:41 +01:00
Sebastian Meyer 637212a889 Merge pull request #105 from stweil/master
Simplify redundant conditional expression
2016-02-24 10:36:13 +01:00
Stefan Weil 970e51779f Simplify redundant conditional expression
This fixes three warnings from PhpStorm.

Signed-off-by: Stefan Weil <sw@weilnetz.de>
2016-02-23 16:33:37 +01:00
Sebastian Meyer dc416e734d Merge pull request #104 from stweil/master
Cleanup code with PhpStorm
2016-02-23 15:55:17 +01:00
Stefan Weil 8d533638e7 Cleaned code with PhpStorm
This typically adds missing semicolons and removes superfluous semicolons.

In some modified blocks, a space was added before the opening bracket
of the block to ease bracket matching in editors.

Signed-off-by: Stefan Weil <sw@weilnetz.de>
2016-02-23 15:45:13 +01:00
Stefan Weil b5bbb3c124 Fix some whitespace issues
* Remove blanks at end of lines.

* Remove empty lines at end of file.

* Terminate each file with a newline character.

Signed-off-by: Stefan Weil <sw@weilnetz.de>
2016-02-23 15:45:13 +01:00
Alexander Bigga d60b80c7f7 Merge pull request #103 from stweil/master
Fix new typo and grammar issue in comment
2016-02-23 15:22:28 +01:00
Stefan Weil 404a601eb1 Fix new typo and grammar issue in comment
The typo was found by codespell.

Signed-off-by: Stefan Weil <sw@weilnetz.de>
2016-02-22 20:50:09 +01:00
Sebastian Meyer 515c92d14c Merge pull request #102 from goobi/fulltext
Merge several feature branches into master
2016-02-22 15:53:20 +01:00
Sebastian Meyer c07a7c6c5c Merge remote-tracking branch 'refs/remotes/origin/ol3' into fulltext 2016-02-22 15:49:49 +01:00
Sebastian Meyer 1c0b2b2087 Remove ElasticSearch feature 2016-02-22 11:14:14 +01:00