Skip to content

Commit ceafed0

Browse files
georgringergeorgringer
committed
[TASK] Further changes
1 parent 55c3013 commit ceafed0

File tree

104 files changed

+3810
-10785
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

104 files changed

+3810
-10785
lines changed

‎.gitignore

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,3 @@
11
.idea/
2-
atlassian-ide-plugin.xml
2+
atlassian-ide-plugin.xml
3+
Resources/Public/Template/img/placeholder/test*

‎Classes/PageTitle.php

+11
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
<?php
2+
3+
class Tx_Modernpackage_PageTitle {
4+
5+
public function getTitleTag($content, $conf) {
6+
$pageTitle = $this->cObj->TEXT((array)$GLOBALS['TSFE']->tmpl->setup['config.']['titleTagFunction.']);
7+
return trim($pageTitle);
8+
}
9+
}
10+
11+
?>

‎Resources/Private/Language/locallang_be.xml

+3-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,9 @@
77
<data type="array">
88
<languageKey index="default" type="array">
99
<!-- Page Tree Icons -->
10-
<label index="pagetree.records">Record Collection</label>
10+
<label index="pagetree.system">[System] Collection</label>
11+
<label index="pagetree.layouts">[System] Layouts</label>
12+
<label index="pagetree.menufolder">[System] Menu directory</label>
1113

1214
<!-- table classes -->
1315
<label index="tableclasses.default">Default</label>

‎Resources/Private/Templates/Partials/Page/header.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ <h1>
1212
<div class="span4 hidden-phone">&nbsp;</div>
1313
<div class="span4 searchlanguage">
1414
<div class="pull-right hidden-phone"> <!-- CONTACT, LANGUAGE-->
15-
<span class="kontakt"><a href="#">Kontakt</a><i class="icon-envelope"></i> | Sprache:</span>
15+
<div class="contact-box"><a href="#">Kontakt</a> | Sprache:</div>
1616
<select class="language">
1717
<option>DE</option>
1818
<option>EN</option>

‎Resources/Private/TypoScript/constants-development.ts

+5-4
Original file line numberDiff line numberDiff line change
@@ -16,15 +16,16 @@
1616
plugin.theme_configuration {
1717
#url = http://dev.project.local/
1818

19+
general {
20+
googleanalytics = 0
21+
pageTitle.prefix = !!DEV!! Modern Package -
22+
}
23+
1924
assets {
2025
merge = 0
2126
compress = 0
2227
}
2328

24-
general {
25-
googleanalytics = 0
26-
}
27-
2829
extensions {
2930
realurl = 1
3031
}

‎Resources/Private/TypoScript/constants-production.ts

+6-3
Original file line numberDiff line numberDiff line change
@@ -12,15 +12,18 @@
1212
# **********************************************************
1313

1414
plugin.theme_configuration {
15-
company = Modern Package
16-
popup = &copy; - Modern Package
17-
title = Modern Package
1815
url = http://localhost/master/
1916

2017
general {
18+
adminPanel = 1
2119
copyright_information.link = 242
2220
googleanalytics = 1
2321
googleanalytics.code = UA-XXXXXXXXXXX
22+
23+
pageTitle {
24+
prefix = Modern Package -
25+
suffix =
26+
}
2427
}
2528

2629
assets {

‎Resources/Private/TypoScript/content/lightbox.ts

+2
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
# **********************************************************
1313

1414
# Add the CSS / JS files
15+
/*
1516
page {
1617
includeCSS {
1718
file5 = EXT:modernpackage/Resources/Public/Contrib/fancybox/jquery.fancybox-1.3.4.css
@@ -26,6 +27,7 @@ page {
2627
enable_fancybox = EXT:modernpackage/Resources/Public/Template/js/enable_fancybox.js
2728
}
2829
}
30+
*/
2931

3032
# Change rendering of images to fit the needs of the lightbox requirements
3133
tt_content.image.20.1.imageLinkWrap {

‎Resources/Private/TypoScript/page/configuration.ts

+7-3
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,7 @@ config {
2323
disablePrefixComment = 1
2424
meaningfulTempFilePrefix = 100
2525

26-
# Admin Panel
27-
admPanel = 0
26+
admPanel = {$plugin.theme_configuration.general.adminPanel}
2827

2928
# remove inline CSS/JS to external
3029
removeDefaultJS = external
@@ -59,14 +58,19 @@ config {
5958
typolinkCheckRootline = 1
6059
content_from_pid_allowOutsideDomain = 1
6160

61+
# Cache
62+
cache_clearAtMidnight = 1
63+
cache_period = 1200
64+
sendCacheHeaders = 1
65+
6266
headerComment (
6367
######################################################################
6468
# __ #
6569
# .--------.-----.--| |.-----.----.-----. #
6670
# | | _ | _ || -__| _| | #
6771
# |__|__|__|_____|_____||_____|__| |__|__| #
6872
# #
69-
# modern TYPO3 theme by Georg Ringer #
73+
# https://github.com/georgringer/modernpackage #
7074
######################################################################
7175
)
7276

‎Resources/Private/TypoScript/page/page.ts

+17-3
Original file line numberDiff line numberDiff line change
@@ -47,16 +47,30 @@ page {
4747
file4.media = screen,print
4848
file5 = EXT:modernpackage/Resources/Public/Template/css/flexslider.css
4949
file5.media = screen,print
50+
file6 = EXT:modernpackage/Resources/Public/Template/css/responsiveTable.css
51+
file6.media = screen,print
5052
}
5153

5254
# JS files to be included
5355
includeJSFooter {
54-
# file2 = EXT:modernpackage/Resources/Public/Template/js/bootstrap.js
55-
file3 = EXT:modernpackage/Resources/Public/Template/js/bootstrap-dropdown.js
56+
bootstrap = EXT:modernpackage/Resources/Public/Template/js/bootstrap.js
57+
flexslider = EXT:modernpackage/Resources/Public/Template/js/jquery.flexslider-min.js
58+
yoxview = EXT:modernpackage/Resources/Public/Template/js/jquery.yoxview-2.21.min.js
59+
placeholder = EXT:modernpackage/Resources/Public/Template/js/placeholder.js
60+
customjs = EXT:modernpackage/Resources/Public/Template/js/script.js
61+
}
62+
63+
includeJS {
64+
html5shiv = EXT:modernpackage/Resources/Public/Template/js/html5shiv.js
65+
html5shiv {
66+
allWrap = <!--[if lt IE 9]>|<![endif]-->
67+
excludeFromConcatenation = 1
68+
forceOnTop = 1
69+
}
5670
}
5771

5872
includeJSFooterlibs {
59-
jQuery = EXT:modernpackage/Resources/Public/Template/js/jquery.js
73+
jQuery = EXT:modernpackage/Resources/Public/Template/js/jquery-1.9.1.js
6074
}
6175

6276

‎Resources/Private/TypoScript/page/seo.ts

+10
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,16 @@ page.meta {
1919
robots = INDEX,FOLLOW
2020
}
2121

22+
# **********************************************************
23+
# <title> - Tag
24+
# **********************************************************
25+
includeLibs.pagetitle = EXT:modernpackage/Classes/PageTitle.php
26+
config.titleTagFunction = Tx_Modernpackage_PageTitle->getTitleTag
27+
config.titleTagFunction {
28+
data = page:subtitle // page:title
29+
30+
noTrimWrap = |{$plugin.theme_configuration.general.pageTitle.prefix} | {$plugin.theme_configuration.general.pageTitle.suffix}|
31+
}
2232

2333
# **********************************************************
2434
# Google Analytics

‎Resources/Public/Icons/PageTree/layouts.png

263 Bytes
Loading

‎Resources/Public/Icons/PageTree/menufolder.png

307 Bytes
Loading

‎Resources/Public/Icons/PageTree/records.png

-301 Bytes
Binary file not shown.

‎Resources/Public/Icons/PageTree/system.png

712 Bytes
Loading

‎Resources/Public/Template/css/flexslider.css

+15-15
Original file line numberDiff line numberDiff line change
@@ -9,26 +9,26 @@
99
* Contributing author: Tyler Smith (@mbmufffin)
1010
*/
1111

12-
12+
1313
/* Browser Resets */
1414
.flex-container a:active,
1515
.flexslider a:active,
1616
.flex-container a:focus,
1717
.flexslider a:focus {outline: none;}
1818
.slides,
1919
.flex-control-nav,
20-
.flex-direction-nav {margin: 0; padding: 0; list-style: none;}
20+
.flex-direction-nav {margin: 0; padding: 0; list-style: none;}
2121

2222
/* FlexSlider Necessary Styles
23-
*********************************/
23+
*********************************/
2424
.flexslider {margin: 0; padding: 0;}
2525
.flexslider .slides > li {display: none; -webkit-backface-visibility: hidden;} /* Hide the slides before the JS is loaded. Avoids image jumping */
2626
.flexslider .slides img {width: 100%; display: block;}
2727
.flex-pauseplay span {text-transform: capitalize;}
2828

2929
/* Clearfix for the .slides element */
30-
.slides:after {content: "."; display: block; clear: both; visibility: hidden; line-height: 0; height: 0;}
31-
html[xmlns] .slides {display: block;}
30+
.slides:after {content: "."; display: block; clear: both; visibility: hidden; line-height: 0; height: 0;}
31+
html[xmlns] .slides {display: block;}
3232
* html .slides {height: 1%;}
3333

3434
/* No JavaScript Fallback */
@@ -50,17 +50,17 @@ html[xmlns] .slides {display: block;}
5050
/* Direction Nav */
5151
.flex-direction-nav {*height: 0;}
5252
.flex-direction-nav a {
53-
width: 30px;
54-
height: 30px;
55-
margin: -20px 0 0;
56-
display: block;
53+
width: 30px;
54+
height: 30px;
55+
margin: -20px 0 0;
56+
display: block;
5757
background: url("../img/gallery/bg_direction_nav.png") no-repeat 0 0;
58-
position: absolute;
59-
top: 50%;
60-
z-index: 10;
61-
cursor: pointer;
62-
text-indent: -9999px;
63-
opacity: 0;
58+
position: absolute;
59+
top: 50%;
60+
z-index: 10;
61+
cursor: pointer;
62+
text-indent: -9999px;
63+
opacity: 0;
6464
-webkit-transition: all .3s ease;
6565
}
6666
.flex-direction-nav .flex-next {background-position: 100% 0; right: -36px; }

0 commit comments

Comments
 (0)