Skip to content

Commit 4f8bbbb

Browse files
committed
- version alighment to v4.2.0
- template bugfix
1 parent 9d6f72b commit 4f8bbbb

13 files changed

+217
-158
lines changed

.database/cdcol-sqlite.db

0 Bytes
Binary file not shown.

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# MvcCore - Example - CD Collection
22

3-
[![Latest Stable Version](https://img.shields.io/badge/Stable-v4.0.0-brightgreen.svg?style=plastic)](https://github.com/mvccore/example-cdcol/releases)
3+
[![Latest Stable Version](https://img.shields.io/badge/Stable-v4.2.0-brightgreen.svg?style=plastic)](https://github.com/mvccore/example-cdcol/releases)
44
[![License](https://img.shields.io/badge/Licence-BSD-brightgreen.svg?style=plastic)](https://github.com/mvccore/example-cdcol/blob/master/LICENCE.md)
55
[![Packager Build](https://img.shields.io/badge/Packager%20Build-passing-brightgreen.svg?style=plastic)](https://github.com/mvccore/packager)
66
![PHP Version](https://img.shields.io/badge/PHP->=5.3-brightgreen.svg?style=plastic)

development/.htaccess

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,6 @@ Options -Indexes
1111
RewriteRule ^Libs/.*$ / [F,L]
1212
RewriteRule ^vendor/.*$ / [F,L]
1313
RewriteRule ^Var/Logs/.*$ / [F,L]
14-
RewriteRule ^Var/Documents.*$ / [F,L]
15-
RewriteRule ^Var/Questionnaires.*$ / [F,L]
1614

1715
# basic zend-framework setup see: http://framework.zend.com/manual/en/zend.controller.html
1816
RewriteCond %{REQUEST_FILENAME} -s [OR]

development/App/Views/Scripts/cd-collection/edit.phtml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<a class="head-btn button button-green" href="<?php
2-
echo $this->Url('CdCollection:');
2+
echo $this->Url(':Index');
33
?>"><span><b>Back to list</b></span></a>
44

55
<h1>Edit album</h1>
Lines changed: 101 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,101 @@
1+
2+
/* /static/css/fonts.css */
3+
@font-face{font-family:'MyriadRegular';src:url('?controller=controller&action=asset&path=/static/fonts/myriadwebpro/myriadwebpro-regular-webfont.eot');src:url('?controller=controller&action=asset&path=/static/fonts/myriadwebpro/myriadwebpro-regular-webfont.eot?#iefix') format('embedded-opentype'),
4+
url('?controller=controller&action=asset&path=/static/fonts/myriadwebpro/myriadwebpro-regular-webfont.woff') format('woff'),
5+
url('?controller=controller&action=asset&path=/static/fonts/myriadwebpro/myriadwebpro-regular-webfont.ttf') format('truetype'),
6+
url('?controller=controller&action=asset&path=/static/fonts/myriadwebpro/myriadwebpro-regular-webfont.svg#MyriadRegular') format('svg');font-weight:normal;font-style:normal}@font-face{font-family:'MyriadSemiBold';src:url('?controller=controller&action=asset&path=/static/fonts/myriadwebpro/myriadwebpro-semibold-webfont.eot');src:url('?controller=controller&action=asset&path=/static/fonts/myriadwebpro/myriadwebpro-semibold-webfont.eot?#iefix') format('embedded-opentype'),
7+
url('?controller=controller&action=asset&path=/static/fonts/myriadwebpro/myriadwebpro-semibold-webfont.woff') format('woff'),
8+
url('?controller=controller&action=asset&path=/static/fonts/myriadwebpro/myriadwebpro-semibold-webfont.ttf') format('truetype'),
9+
url('?controller=controller&action=asset&path=/static/fonts/myriadwebpro/myriadwebpro-semibold-webfont.svg#MyriadSemiBold') format('svg');font-weight:bold;font-style:normal}@font-face{font-family:'MyriadBold';src:url('?controller=controller&action=asset&path=/static/fonts/myriadwebpro/myriadwebpro-bold-webfont.eot');src:url('?controller=controller&action=asset&path=/static/fonts/myriadwebpro/myriadwebpro-bold-webfont.eot?#iefix') format('embedded-opentype'),
10+
url('?controller=controller&action=asset&path=/static/fonts/myriadwebpro/myriadwebpro-bold-webfont.woff') format('woff'),
11+
url('?controller=controller&action=asset&path=/static/fonts/myriadwebpro/myriadwebpro-bold-webfont.ttf') format('truetype'),
12+
url('?controller=controller&action=asset&path=/static/fonts/myriadwebpro/myriadwebpro-bold-webfont.svg#MyriadBold') format('svg');font-weight:bold;font-style:normal}
13+
14+
/* /static/css/all.css */
15+
html,body{margin:0;font-family:'MyriadRegular',Arial,Helvetica,sans-serif;line-height:1.5em;font-size:14px;background:#999}.clear{clear:both}.master-container{width:500px;margin:30px
16+
auto 50px auto}input.text-link{background:transparent;border:0;padding:0}a,input.text-link{font-family:'MyriadRegular';color:#307C00;text-decoration:none;border-bottom:1px solid #307C00;cursor:pointer}a:hover,a:focus,a:active,input.text-link:hover,input.text-link:focus,input.text-link:active{color:#5FA21B;border-bottom:1px solid #5FA21B}a:visited{color:#7CD023;border-bottom:1px solid #7CD023}form input[type=text],form input[type=number],form input[type=password]{padding:8px
17+
10px;font-size:14px;border:1px
18+
solid #bbb;margin:5px
19+
0;-webkit-border-radius:3px;-moz-border-radius:3px;-ms-border-radius:3px;-o-border-radius:3px;-khtml-border-radius:3px;border-radius:3px;-webkit-box-shadow:inset 1px 1px 20px -10px rgba(0,0,0,0.75);-moz-box-shadow:inset 1px 1px 20px -10px rgba(0,0,0,0.75);-ms-box-shadow:inset 1px 1px 20px -10px rgba(0,0,0,0.75);-o-box-shadow:inset 1px 1px 20px -10px rgba(0,0,0,0.75);-khtml-box-shadow:inset 1px 1px 20px -10px rgba(0,0,0,0.75);box-shadow:inset 1px 1px 20px -10px rgba(0,0,0,0.75)}.content{padding:25px;background:#fff;border-radius:3px;box-shadow:0 0 15px rgba(0,0,0,0.6)}.content a.head-btn{float:right}.content
20+
h1{margin:10px
21+
0 25px 0;font-family:'MyriadBold';font-size:32px}.cd-collection-items{width:100%}.cd-collection-items th,
22+
.cd-collection-items
23+
td{text-align:left;padding:2px
24+
5px}.cd-collection-items th.right,
25+
.cd-collection-items
26+
td.right{text-align:right}.cd-collection-items th.center,
27+
.cd-collection-items
28+
td.center{text-align:center}.cd-collection-items
29+
th{background:#7cd023;color:#fff}.cd-collection-items
30+
td{white-space:nowrap}.error{color:#ff0021;font-family:'MyriadBold';text-align:center}form#detail{margin:25px;text-align:center}form#detail
31+
label{display:block}form#detail label
32+
span{display:inline-block;width:70px}form#detail
33+
button.send{margin:5px
34+
0 0 95px}form#detail
35+
button{float:left}form#detail label
36+
span{width:56px;text-align:right;padding:0
37+
10px 0 0}form#detail
38+
input{width:200px;margin:5px
39+
56px 5px 0}form#detail
40+
input.year{width:100px;margin-right:156px}form.sign-in{margin:25px;text-align:center}form.sign-in
41+
button{margin:10px
42+
auto}form.sign-in
43+
input{width:200px;margin:5px
44+
auto;display:block}form.sign-in input.text-link:hover,form.sign-in input.text-link:focus,
45+
form.sign-in input.text-link:active{border-bottom:0 !important}form.sign-out{height:21px;margin:0
46+
25px 10px 25px;text-align:right;color:#fff}form.sign-out
47+
input{margin-left:5px;color:#fff !important;border-bottom:1px solid #fff !important}form.sign-out input.text-link:hover,form.sign-out input.text-link:focus,
48+
form.sign-out input.text-link:active{border-bottom:0 !important}
49+
50+
/* /static/css/button.css */
51+
button,
52+
button span,
53+
button span b,
54+
.button,
55+
.button span,
56+
.button span
57+
b{display:block;text-decoration:none;height:31px;border:0;padding-top:0;padding-bottom:0;cursor:pointer;text-decoration:none !important;white-space:nowrap}button,
58+
button span,
59+
.button,
60+
.button
61+
span{line-height:31px;background-color:transparent;background-image:url('?controller=controller&action=asset&path=/static/img/buttons.png')}button,.button{margin:0;padding-left:15px;padding-right:0;background-position:0 0}.filters button,
62+
.filters
63+
.button{padding-left:0}button span,
64+
.button
65+
span{position:relative;padding-right:15px;padding-left:0;background-position:100% -62px}.filters button span,
66+
.filters .button
67+
span{padding-right:0;margin-top:1px;top:-1px}.filters button span b,
68+
.filters .button span
69+
b{margin-right:15px}@-moz-document url-prefix(){button
70+
span{top:-1px}}button span b,
71+
.button span
72+
b{font-size:16px;line-height:33px;font-family:'MyriadSemiBold',Arial,Helvetica,sans-serif;overflow:hidden}button span b,
73+
.button span
74+
b{font-size:16px;line-height:33px;font-family:'MyriadSemiBold',Arial,Helvetica,sans-serif;overflow:hidden}.filters button span b,
75+
.filters .button span
76+
b{position:relative;top:-2px}button,button:hover,button:focus,button:active{outline:0
77+
!important}.button-green{background-position:0 0}.button-green
78+
span{background-position:100% -124px}.button-green:hover,.button-green:focus{background-position:0 -31px}.button-green:hover span,.button-green:focus
79+
span{background-position:100% -155px}.button-green.button-left-arrow{padding-left:37px;background-position:0 -62px}.button-green.button-left-arrow:hover,.button-green.button-left-arrow:focus{background-position:0 -93px}.button-green.button-right-arrow
80+
span{padding-right:37px;background-position:100% -186px}.button-green.button-right-arrow:hover span,.button-green.button-right-arrow:focus
81+
span{background-position:100% -217px}.button-blue{background-position:0 -248px}.button-blue
82+
span{background-position:100% -372px}.button-blue:hover,.button-blue:focus{background-position:0 -279px}.button-blue:hover span,.button-blue:focus
83+
span{background-position:100% -403px}.button-blue.button-left-arrow{padding-left:37px;background-position:0 -310px}.button-blue.button-left-arrow:hover,.button-blue.button-left-arrow:focus{background-position:0 -341px}.button-blue.button-right-arrow
84+
span{padding-right:37px;background-position:100% -434px}.button-blue.button-right-arrow:hover span,.button-blue.button-right-arrow:focus
85+
span{background-position:100% -465px}.button:hover,.button:focus,.button:active{background-color:transparent !important}.button-green span
86+
b{display:block;color:#fff;text-shadow:-1px -1px 1px #56a800,1px -1px 1px #56a800,-1px 1px 1px #56a800,1px 1px 1px #56a800;-moz-text-shadow:-1px -1px 1px #56a800,1px -1px 1px #56a800,-1px 1px 1px #56a800,1px 1px 1px #56a800;-webkit-text-shadow:-1px -1px 1px #56a800,1px -1px 1px #56a800,-1px 1px 1px #56a800,1px 1px 1px #56a800;-ms-text-shadow:-1px -1px 1px #56a800,1px -1px 1px #56a800,-1px 1px 1px #56a800,1px 1px 1px #56a800;-o-text-shadow:-1px -1px 1px #56a800,1px -1px 1px #56a800,-1px 1px 1px #56a800,1px 1px 1px #56a800;-khtml-text-shadow:-1px -1px 1px #56a800,1px -1px 1px #56a800,-1px 1px 1px #56a800,1px 1px 1px #56a800}.filters .button-green span
87+
b{zoom:1;background-color:#56a801;filter:progid:DXImageTransform.Microsoft.Chroma(Color=#56a801)
88+
progid:DXImageTransform.Microsoft.Dropshadow(offX=0,offY=-1,Color=#56a800,positive=true)}.button-blue span
89+
b{display:block;color:#fff;text-shadow:-1px -1px 1px #006ba8,1px -1px 1px #006ba8,-1px 1px 1px #006ba8,1px 1px 1px #006ba8;-moz-text-shadow:-1px -1px 1px #006ba8,1px -1px 1px #006ba8,-1px 1px 1px #006ba8,1px 1px 1px #006ba8;-webkit-text-shadow:-1px -1px 1px #006ba8,1px -1px 1px #006ba8,-1px 1px 1px #006ba8,1px 1px 1px #006ba8;-ms-text-shadow:-1px -1px 1px #006ba8,1px -1px 1px #006ba8,-1px 1px 1px #006ba8,1px 1px 1px #006ba8;-o-text-shadow:-1px -1px 1px #006ba8,1px -1px 1px #006ba8,-1px 1px 1px #006ba8,1px 1px 1px #006ba8;-khtml-text-shadow:-1px -1px 1px #006ba8,1px -1px 1px #006ba8,-1px 1px 1px #006ba8,1px 1px 1px #006ba8}.filters .button-blue span
90+
b{zoom:1;background-color:#006ba9;filter:progid:DXImageTransform.Microsoft.Chroma(Color=#006ba9)
91+
progid:DXImageTransform.Microsoft.Dropshadow(offX=0,offY=-1,Color=#006ba8,positive=true)}.button-green:active span b,
92+
.button-blue:active span
93+
b{display:block;color:#fff;text-shadow:-1px -1px 1px #cc8000,1px -1px 1px #cc8000,-1px 1px 1px #cc8000,1px 1px 1px #cc8000;-moz-text-shadow:-1px -1px 1px #cc8000,1px -1px 1px #cc8000,-1px 1px 1px #cc8000,1px 1px 1px #cc8000;-webkit-text-shadow:-1px -1px 1px #cc8000,1px -1px 1px #cc8000,-1px 1px 1px #cc8000,1px 1px 1px #cc8000;-ms-text-shadow:-1px -1px 1px #cc8000,1px -1px 1px #cc8000,-1px 1px 1px #cc8000,1px 1px 1px #cc8000;-o-text-shadow:-1px -1px 1px #cc8000,1px -1px 1px #cc8000,-1px 1px 1px #cc8000,1px 1px 1px #cc8000;-khtml-text-shadow:-1px -1px 1px #cc8000,1px -1px 1px #cc8000,-1px 1px 1px #cc8000,1px 1px 1px #cc8000}.filters .button-green:active span b,
94+
.filters .button-blue:active span
95+
b{zoom:1;background-color:#cc8001;filter:progid:DXImageTransform.Microsoft.Chroma(Color=#cc8001)
96+
progid:DXImageTransform.Microsoft.Dropshadow(offX=0,offY=-1,Color=#cc8000,positive=true)}.button-green:active,.button-blue:active{background-position:0 -527px}.button-green:active span,
97+
.button-blue:active
98+
span{background-position:100% -651px}.button-green.button-right-arrow:active span,
99+
.button-blue.button-right-arrow:active
100+
span{background-position:100% -713px}.button-green.button-left-arrow:active,.button-blue.button-left-arrow:active{background-position:0 -589px}.button-blue.button-left-arrow:active
101+
span{background-position:100% -651px}

0 commit comments

Comments
 (0)