repo
string
commit
string
message
string
diff
string
jtietema/Fizzy
34824effe3bea84ae60cf3cb6c3f95acc3b6b9b2
improvements in styling comments
diff --git a/application/assets/css/fizzy-2.0.css b/application/assets/css/fizzy-2.0.css index 21903a0..a1364dd 100644 --- a/application/assets/css/fizzy-2.0.css +++ b/application/assets/css/fizzy-2.0.css @@ -20,520 +20,520 @@ body { em { font-style: italic; } a { color: #3581C5; text-decoration: none; }...
jtietema/Fizzy
e5ad6ed1a281f6cda6a9aac1b57ba6e1dec7744b
fixed typo
diff --git a/application/modules/admin/controllers/CommentsController.php b/application/modules/admin/controllers/CommentsController.php index 4e7384c..60c84a8 100644 --- a/application/modules/admin/controllers/CommentsController.php +++ b/application/modules/admin/controllers/CommentsController.php @@ -1,286 +1,286 @@...
jtietema/Fizzy
22b8cf4b1ca867b985eaab26052f3feff13e6a42
modified readme and added LGPL License
diff --git a/LICENSE.txt b/LICENSE-BSD.txt similarity index 100% rename from LICENSE.txt rename to LICENSE-BSD.txt diff --git a/LICENSE-LGPL.txt b/LICENSE-LGPL.txt new file mode 100644 index 0000000..60d6d4c --- /dev/null +++ b/LICENSE-LGPL.txt @@ -0,0 +1,504 @@ + GNU LESSER GENERAL PUBLIC LICENSE + Version...
jtietema/Fizzy
19f2b888a84c2c3003bdcb7dc5dcee291bf1ffe5
documentation and improvements in the spam backend
diff --git a/library/Fizzy/Spam.php b/library/Fizzy/Spam.php index 57bf056..4fdfad1 100644 --- a/library/Fizzy/Spam.php +++ b/library/Fizzy/Spam.php @@ -1,64 +1,91 @@ <?php /** * Class Fizzy_Spam * @package Fizzy * @subpackage Spam * * LICENSE * * This source file is subject to the new BSD license that ...
jtietema/Fizzy
09550e0bba71821e4bbfa975576fd38696698565
paging in de comments threads list
diff --git a/application/modules/admin/controllers/CommentsController.php b/application/modules/admin/controllers/CommentsController.php index bcdaaaa..4e7384c 100644 --- a/application/modules/admin/controllers/CommentsController.php +++ b/application/modules/admin/controllers/CommentsController.php @@ -1,280 +1,286 @@...
jtietema/Fizzy
eaba789ca2038eaf44c503547f845f167ed53b10
comments & blog post integratie
diff --git a/application/assets/css/fizzy-2.0.css b/application/assets/css/fizzy-2.0.css index c6fef36..21903a0 100644 --- a/application/assets/css/fizzy-2.0.css +++ b/application/assets/css/fizzy-2.0.css @@ -1,534 +1,539 @@ /** * Fizzy 2.0 Stylesheet * * Scheme: http://colorschemedesigner.com/#3D11TpE--l2br *...
jtietema/Fizzy
5a25f4040ddebabd58768bcc40fcfad31b57d5aa
Added view helper for Fizzy assets
diff --git a/library/Fizzy/View/Helper/AssetUrl.php b/library/Fizzy/View/Helper/AssetUrl.php new file mode 100644 index 0000000..e90c7bf --- /dev/null +++ b/library/Fizzy/View/Helper/AssetUrl.php @@ -0,0 +1,62 @@ +<?php +/** + * Class Fizzy_View_Helper_AssetUrl + * @package Fizzy + * @subpackage View + * @category Help...
jtietema/Fizzy
9ab93e9a02d767ec7a9e44abfab39119755c32e3
fixed bug that inserted empty items in sub-navigation
diff --git a/application/modules/admin/views/scripts/subnavigation.phtml b/application/modules/admin/views/scripts/subnavigation.phtml index b48bcb8..8649f17 100644 --- a/application/modules/admin/views/scripts/subnavigation.phtml +++ b/application/modules/admin/views/scripts/subnavigation.phtml @@ -1,11 +1,11 @@ <ul>...
jtietema/Fizzy
6580e7d3556a62b8f0cda0a36d7968a6fa76412e
sub-navigation
diff --git a/application/assets/css/fizzy-2.0.css b/application/assets/css/fizzy-2.0.css index ad8f0e6..4471424 100644 --- a/application/assets/css/fizzy-2.0.css +++ b/application/assets/css/fizzy-2.0.css @@ -1,527 +1,541 @@ /** * Fizzy 2.0 Stylesheet * * Scheme: http://colorschemedesigner.com/#3D11TpE--l2br *...
jtietema/Fizzy
c686e5a53c2804107e28848d3a0b45152eb7e7b2
fixed old viewhelper
diff --git a/application/modules/admin/views/scripts/blogs/blog.phtml b/application/modules/admin/views/scripts/blogs/blog.phtml index 0f391fb..f707ca2 100644 --- a/application/modules/admin/views/scripts/blogs/blog.phtml +++ b/application/modules/admin/views/scripts/blogs/blog.phtml @@ -1,56 +1,56 @@ <div id="content...
jtietema/Fizzy
ab547afb330a62956d10341031fef65fa4091db3
Fizzy_Navigation_Page_Route
diff --git a/application/modules/admin/controllers/IndexController.php b/application/modules/admin/controllers/IndexController.php index e6c4f2f..913f8da 100644 --- a/application/modules/admin/controllers/IndexController.php +++ b/application/modules/admin/controllers/IndexController.php @@ -1,233 +1,178 @@ <?php /**...
jtietema/Fizzy
fd0ab2f3b3c7b77a8b36f10172c8ff70c9bcec6b
Resetting old setting value on save failure
diff --git a/application/modules/admin/views/scripts/settings/index.phtml b/application/modules/admin/views/scripts/settings/index.phtml index c27bf58..bc2d08f 100644 --- a/application/modules/admin/views/scripts/settings/index.phtml +++ b/application/modules/admin/views/scripts/settings/index.phtml @@ -1,200 +1,201 @@...
jtietema/Fizzy
ee1a04ff30da615dae7b1b5e102247817df7f5d9
Added a getValue method to the Setting API
diff --git a/application/models/Setting.php b/application/models/Setting.php index 34643ee..0ebe0a9 100644 --- a/application/models/Setting.php +++ b/application/models/Setting.php @@ -1,76 +1,93 @@ <?php /** * Setting * * This class has been auto-generated by the Doctrine ORM Framework * * @package ...
jtietema/Fizzy
309534d6a9aeba1a390ca5c9973dc3e72452fd16
Settings screen
diff --git a/.gitignore b/.gitignore index 0529423..d87ef07 100644 --- a/.gitignore +++ b/.gitignore @@ -1,8 +1,10 @@ configs/fizzy.ini data/*.xml data/docs *.swp application/assets/images/mimetypes/gion application/assets/images/mimetypes/humanity application/assets/images/mimetypes/micho public/uploads/* +.DS...
jtietema/Fizzy
e49af446e989fbd499a5286d50897acbe5455603
fixed old viewhelper in pages viewscripts
diff --git a/application/modules/admin/views/scripts/pages/form.phtml b/application/modules/admin/views/scripts/pages/form.phtml index c389f26..a25dce2 100644 --- a/application/modules/admin/views/scripts/pages/form.phtml +++ b/application/modules/admin/views/scripts/pages/form.phtml @@ -1,68 +1,68 @@ <form action="<?...
jtietema/Fizzy
cae2cadf4a046993f3c62170686255466f256e05
better navigation in comments module
diff --git a/application/models/Comments.php b/application/models/Comments.php index def2929..ab5e47e 100644 --- a/application/models/Comments.php +++ b/application/models/Comments.php @@ -1,77 +1,77 @@ <?php /** * Comments * * This class has been auto-generated by the Doctrine ORM Framework * * @packag...
jtietema/Fizzy
273de6029d887e87a2fcb0ec49665c3532423ea4
fixed usage of old view helpers
diff --git a/application/modules/admin/controllers/CommentsController.php b/application/modules/admin/controllers/CommentsController.php index 4b24dbf..6c9f3e8 100644 --- a/application/modules/admin/controllers/CommentsController.php +++ b/application/modules/admin/controllers/CommentsController.php @@ -1,303 +1,303 @@...
jtietema/Fizzy
4dda7628023ad72235347ca33c109d708b8cb9be
Blog & Comments WIP
diff --git a/application/models/generated/BaseComments.php b/application/models/generated/BaseComments.php index 84bb67f..c1bcfe4 100644 --- a/application/models/generated/BaseComments.php +++ b/application/models/generated/BaseComments.php @@ -1,92 +1,93 @@ <?php /** * BaseComments * * This class has been a...
jtietema/Fizzy
22ff292dce5204117870e06f6a6736a606f682b5
Comments module
diff --git a/application/Bootstrap.php b/application/Bootstrap.php index afb5a56..23dff2c 100644 --- a/application/Bootstrap.php +++ b/application/Bootstrap.php @@ -1,85 +1,103 @@ <?php /** * Class Bootstrap * @category Fizzy * @package Fizzy_Bootstrap * * LICENSE * * This source file is subject to the ...
jtietema/Fizzy
c1708d650b3e8fe684462a80856a2dc283b6df5e
Javascript for inline edit settings
diff --git a/application/assets/css/fizzy-2.0.css b/application/assets/css/fizzy-2.0.css index 575a8d9..75664d3 100644 --- a/application/assets/css/fizzy-2.0.css +++ b/application/assets/css/fizzy-2.0.css @@ -1,487 +1,494 @@ /** * Fizzy 2.0 Stylesheet * * Scheme: http://colorschemedesigner.com/#3D11TpE--l2br *...
jtietema/Fizzy
6e15f67060ec5c3c0d33c53cfb62ced1f53cc320
Routes are parsed for backendSwitch config options
diff --git a/application/Bootstrap.php b/application/Bootstrap.php index 88b80bb..c399532 100644 --- a/application/Bootstrap.php +++ b/application/Bootstrap.php @@ -1,89 +1,104 @@ <?php /** * Class Bootstrap * @category Fizzy * @package Fizzy_Bootstrap * * LICENSE * * This source file is subject to the ...
jtietema/Fizzy
792390e934410110fd80d0786ade80e057c11dcf
Expanded the Link View Helper
diff --git a/application/modules/admin/views/scripts/pages/index.phtml b/application/modules/admin/views/scripts/pages/index.phtml index 753e68f..85bcb33 100644 --- a/application/modules/admin/views/scripts/pages/index.phtml +++ b/application/modules/admin/views/scripts/pages/index.phtml @@ -1,48 +1,48 @@ <div id="con...
jtietema/Fizzy
fadcb77e7b599e77f072f9854f0bfa2cebd25cf7
Fizzy View Helpers
diff --git a/application/Bootstrap.php b/application/Bootstrap.php index afb5a56..88b80bb 100644 --- a/application/Bootstrap.php +++ b/application/Bootstrap.php @@ -1,85 +1,89 @@ <?php /** * Class Bootstrap * @category Fizzy * @package Fizzy_Bootstrap * * LICENSE * * This source file is subject to the n...
jtietema/Fizzy
c68b9cb6674de192e08b79e6e0175f7c4bb1ab6f
removed relation Comments -> Posts for more flexibility
diff --git a/application/models/Post.php b/application/models/Post.php index 075cbe1..562cc35 100644 --- a/application/models/Post.php +++ b/application/models/Post.php @@ -1,24 +1,31 @@ <?php /** * Post * * This class has been auto-generated by the Doctrine ORM Framework * * @package ##PACKAGE## *...
jtietema/Fizzy
aa9ae6324f7a97da7bf2ac2eb0677d84753408d3
fixed notice in settings
diff --git a/application/modules/admin/controllers/IndexController.php b/application/modules/admin/controllers/IndexController.php index 716c266..0c220fa 100644 --- a/application/modules/admin/controllers/IndexController.php +++ b/application/modules/admin/controllers/IndexController.php @@ -1,190 +1,190 @@ <?php /**...
jtietema/Fizzy
c192cce9399abbad8929ea36e8e58a91753e95e7
added lots of missing license headers
diff --git a/application/Bootstrap.php b/application/Bootstrap.php index 1bccd8f..f337d3e 100644 --- a/application/Bootstrap.php +++ b/application/Bootstrap.php @@ -1,67 +1,85 @@ <?php +/** + * Class Bootstrap + * @category Fizzy + * @package Fizzy_Bootstrap + * + * LICENSE + * + * This source file is subject to the n...
jtietema/Fizzy
296bc3f0863e68d304370948b15f577a75bccf54
styling version numbers
diff --git a/application/assets/css/fizzy-2.0.css b/application/assets/css/fizzy-2.0.css index fd5a54f..575a8d9 100644 --- a/application/assets/css/fizzy-2.0.css +++ b/application/assets/css/fizzy-2.0.css @@ -1,491 +1,487 @@ /** * Fizzy 2.0 Stylesheet * * Scheme: http://colorschemedesigner.com/#3D11TpE--l2br *...
jtietema/Fizzy
263444d5a6e94589628366aaa9520dad34132a90
Basic contact log && Setting change
diff --git a/application/assets/css/tables.css b/application/assets/css/tables.css index b2b87f7..a9bd7b3 100644 --- a/application/assets/css/tables.css +++ b/application/assets/css/tables.css @@ -1,131 +1,164 @@ /** * Fizzy Tables stylesheet for theme 2.0 * * @author Mattijs Hoitink <mattijs@voidwalkers.nl> *...
jtietema/Fizzy
7b645d8e4e708867f3705b12a589b1485f401342
pagination controls layout + forgotten file
diff --git a/application/modules/admin/views/scripts/blogs/_pagination.phtml b/application/modules/admin/views/scripts/blogs/_pagination.phtml index 44efc46..e88da1a 100644 --- a/application/modules/admin/views/scripts/blogs/_pagination.phtml +++ b/application/modules/admin/views/scripts/blogs/_pagination.phtml @@ -1,1...
jtietema/Fizzy
3d06202af01d4d483d39eb073260c964c7eacb78
comment and status options for posts
diff --git a/application/models/Blog.php b/application/models/Blog.php index 177cfc5..c2c617b 100644 --- a/application/models/Blog.php +++ b/application/models/Blog.php @@ -1,20 +1,30 @@ <?php /** * Blog * * This class has been auto-generated by the Doctrine ORM Framework * * @package ##PACKAGE## *...
jtietema/Fizzy
58b5d512a4672779da652a3091916b20b132feb2
datepicker now returns correct format
diff --git a/application/modules/admin/controllers/BlogsController.php b/application/modules/admin/controllers/BlogsController.php index dd4ed4c..fdf413b 100644 --- a/application/modules/admin/controllers/BlogsController.php +++ b/application/modules/admin/controllers/BlogsController.php @@ -1,166 +1,167 @@ <?php c...
jtietema/Fizzy
a36ed11a05ad3c434ff04f8fdeff1f64b7eb7f82
adds version info to CMS layout
diff --git a/application/assets/css/fizzy-2.0.css b/application/assets/css/fizzy-2.0.css index 575a8d9..fd5a54f 100644 --- a/application/assets/css/fizzy-2.0.css +++ b/application/assets/css/fizzy-2.0.css @@ -1,487 +1,491 @@ /** * Fizzy 2.0 Stylesheet * * Scheme: http://colorschemedesigner.com/#3D11TpE--l2br *...
jtietema/Fizzy
6ac521b79ac142d240350f0eae7d6b41734f1ce0
Settings screen
diff --git a/application/models/Setting.php b/application/models/Setting.php new file mode 100644 index 0000000..0891c29 --- /dev/null +++ b/application/models/Setting.php @@ -0,0 +1,43 @@ +<?php + +/** + * Setting + * + * This class has been auto-generated by the Doctrine ORM Framework + * + * @package ##PACKAGE#...
jtietema/Fizzy
6659d2cc806e2404ca802dbe76c0e85b1a66c69a
users now have a displayname
diff --git a/application/models/User.php b/application/models/User.php index 868567a..2b9d1a4 100644 --- a/application/models/User.php +++ b/application/models/User.php @@ -1,27 +1,28 @@ <?php /** * User * * This class has been auto-generated by the Doctrine ORM Framework * * @package ##PACKAGE## *...
jtietema/Fizzy
5c52cb8ec7ec046d276287456f4506d38e000fec
blog styling
diff --git a/application/assets/css/fizzy-2.0.css b/application/assets/css/fizzy-2.0.css index b31c128..575a8d9 100644 --- a/application/assets/css/fizzy-2.0.css +++ b/application/assets/css/fizzy-2.0.css @@ -1,481 +1,487 @@ /** * Fizzy 2.0 Stylesheet * * Scheme: http://colorschemedesigner.com/#3D11TpE--l2br *...
jtietema/Fizzy
36c3094e9d55dd4b634bbb70087b8a13f9e0d439
Added settings routes, updated settings schema
diff --git a/configs/routes.ini b/configs/routes.ini index 7165056..fe2c51f 100644 --- a/configs/routes.ini +++ b/configs/routes.ini @@ -1,131 +1,131 @@ [development : production] [test : production] [production] ;; Catch all for pages slugs page_by_slug.route = "/:slug" page_by_slug.defaults.controller = "...
jtietema/Fizzy
ad9e97b44304eeab1b3e776ac629a79e0382605b
isNew function for all models
diff --git a/application/models/Blog.php b/application/models/Blog.php index edf0839..177cfc5 100644 --- a/application/models/Blog.php +++ b/application/models/Blog.php @@ -1,16 +1,20 @@ <?php /** * Blog * * This class has been auto-generated by the Doctrine ORM Framework * * @package ##PACKAGE## *...
jtietema/Fizzy
ea59dae37cda0b5805595a855c74a019ea17aa6a
Added setting model
diff --git a/database/fixtures/settings.yml b/database/fixtures/settings.yml new file mode 100644 index 0000000..727ffd1 --- /dev/null +++ b/database/fixtures/settings.yml @@ -0,0 +1,43 @@ +Setting: + website_title: + component: application + key: title + value: Fizzy + label: "Application title" + desc...
jtietema/Fizzy
40f8225a69b459d00570e438ae0e49a4651adeca
eerste versie blog WIP
diff --git a/application/Bootstrap.php b/application/Bootstrap.php index 5e3cfbb..1bccd8f 100644 --- a/application/Bootstrap.php +++ b/application/Bootstrap.php @@ -1,63 +1,67 @@ <?php /** * Description of Bootstrap * * @author jeroen */ class Bootstrap extends Zend_Application_Bootstrap_Bootstrap { ...
jtietema/Fizzy
29f1a3718eb20e66335ec334c7190a71451d9b19
added ZendX (1.10.4)
diff --git a/library/ZendX/Application/Resource/Jquery.php b/library/ZendX/Application/Resource/Jquery.php new file mode 100644 index 0000000..6273b7d --- /dev/null +++ b/library/ZendX/Application/Resource/Jquery.php @@ -0,0 +1,167 @@ +<?php +/** + * Zend Framework + * + * LICENSE + * + * This source file is subject to...
jtietema/Fizzy
fa8ad70a24160ae3a02210e74b078d895a391b37
Styled login screen
diff --git a/application/modules/admin/views/layouts/login.phtml b/application/modules/admin/views/layouts/login.phtml index 3a02ccd..2e3bd41 100644 --- a/application/modules/admin/views/layouts/login.phtml +++ b/application/modules/admin/views/layouts/login.phtml @@ -1,54 +1,57 @@ <?php /** * Fizzy login layout ...
jtietema/Fizzy
5f232149e9920a65e20a013d27627f75d695e2a7
Added Zend_Navigation for generating admin menu
diff --git a/application/modules/admin/controllers/IndexController.php b/application/modules/admin/controllers/IndexController.php index 6b8f720..f339e11 100644 --- a/application/modules/admin/controllers/IndexController.php +++ b/application/modules/admin/controllers/IndexController.php @@ -1,23 +1,103 @@ <?php +/** ...
jtietema/Fizzy
700b22296c41c8207ea949e63895e1fbfe03fcdf
geocode adapter interface aangepast
diff --git a/application/library/Fizzy/Geocode/Adapter/Interface.php b/application/library/Fizzy/Geocode/Adapter/Interface.php index a0249de..5759750 100644 --- a/application/library/Fizzy/Geocode/Adapter/Interface.php +++ b/application/library/Fizzy/Geocode/Adapter/Interface.php @@ -1,8 +1,8 @@ <?php interface Fizzy...
jtietema/Fizzy
b6c0a4ffc305b48c56eb44e051ce5cb592ac0884
Geocode Response object & yahoo adapter
diff --git a/application/library/Fizzy/Geocode/Adapter/Google.php b/application/library/Fizzy/Geocode/Adapter/Google.php index eecf301..5a26496 100644 --- a/application/library/Fizzy/Geocode/Adapter/Google.php +++ b/application/library/Fizzy/Geocode/Adapter/Google.php @@ -1,205 +1,214 @@ <?php require_once 'Zend/Http...
jtietema/Fizzy
94d63f3be317d83629e677d0ad48920fec0484d9
Fizzy_Geocode initial code
diff --git a/application/library/Fizzy/Geocode.php b/application/library/Fizzy/Geocode.php new file mode 100644 index 0000000..613029c --- /dev/null +++ b/application/library/Fizzy/Geocode.php @@ -0,0 +1,41 @@ +<?php + +/** + * This class provides a uniform API for making Geocode requests to different + * Geocode provi...
jtietema/Fizzy
738fb8829aeeca88c662fd83168685ff9ba49c23
initial version of Fizzy_Json_Client
diff --git a/application/library/Fizzy/Json/Client.php b/application/library/Fizzy/Json/Client.php new file mode 100644 index 0000000..7d3aa03 --- /dev/null +++ b/application/library/Fizzy/Json/Client.php @@ -0,0 +1,239 @@ +<?php +require_once 'Zend/Json.php'; +require_once 'Zend/Http/Client.php'; + +require_once 'Fizz...
jtietema/Fizzy
4afe665abdfcd32e09d37e984883d55a75231e64
errorcontroller and dev.php index file
diff --git a/application/bootstrap.php b/application/bootstrap.php index e359f53..ecfc526 100644 --- a/application/bootstrap.php +++ b/application/bootstrap.php @@ -1,31 +1,31 @@ <?php /** * Fizzy bootstrap file * @package Fizzy * * LICENSE * * This source file is subject to the new BSD license that is bu...
jtietema/Fizzy
69a26ad798d7f6165b0e0a4f91579ccce958f515
layouts and templates now work in the pages module
diff --git a/application/library/Fizzy.php b/application/library/Fizzy.php index d4e5380..7e6c2f3 100644 --- a/application/library/Fizzy.php +++ b/application/library/Fizzy.php @@ -1,644 +1,643 @@ <?php /** Zend_Config */ require_once 'Zend/Config.php'; /** * Fizzy application class. Takes care of gathering a...
jtietema/Fizzy
92101795dc7e6c5fa7d87a2ee1e75d74e9031a04
Domain validator
diff --git a/application/library/Fizzy/Validate/Domain.php b/application/library/Fizzy/Validate/Domain.php new file mode 100644 index 0000000..2e58ef9 --- /dev/null +++ b/application/library/Fizzy/Validate/Domain.php @@ -0,0 +1,149 @@ +<?php +/** + * Class Fizzy_Validate_Domain + * @category Fizzy + * @package Fizzy_Va...
jtietema/Fizzy
01cc6cecd98ed7002c416585e6dd7e6dfa2546b7
fixed wysiwyg form submission
diff --git a/application/assets/js/fizzy.js b/application/assets/js/fizzy.js index 5b8482f..4c1b519 100644 --- a/application/assets/js/fizzy.js +++ b/application/assets/js/fizzy.js @@ -1,39 +1,39 @@ var Fizzy = function(){ var _editors = []; return { "wysiwyg" : { "count" : functi...
jtietema/Fizzy
65abc1893f868d296e94900dedde4accf99fd774
Imagepicker now supports margins
diff --git a/application/assets/css/fizzy.css b/application/assets/css/fizzy.css index 65255b2..e925a84 100644 --- a/application/assets/css/fizzy.css +++ b/application/assets/css/fizzy.css @@ -1,412 +1,441 @@ @import 'screen.css'; html, body { margin: 0; padding: 0; background-color: #777777; fo...
jtietema/Fizzy
9fa2557f859f21afac052e578fe252d26ded199b
Twitter account validator
diff --git a/application/library/Fizzy/Validate/TwitterAccount.php b/application/library/Fizzy/Validate/TwitterAccount.php new file mode 100644 index 0000000..382503b --- /dev/null +++ b/application/library/Fizzy/Validate/TwitterAccount.php @@ -0,0 +1,72 @@ +<?php +/** + * Class Fizzy_Validate_TwitterAccount + * @categ...
jtietema/Fizzy
7c613db9fe78d80c96302fb7f912236f7c3841bc
New Validators
diff --git a/application/library/Fizzy/Validate/EmailAddressSimple.php b/application/library/Fizzy/Validate/EmailAddressSimple.php new file mode 100644 index 0000000..5399312 --- /dev/null +++ b/application/library/Fizzy/Validate/EmailAddressSimple.php @@ -0,0 +1,57 @@ +<?php +/** + * Class Fizzy_Validate_EmailAddressS...
jtietema/Fizzy
66e664ca146fa221a071fe2a179284e94a0fa846
position dropdown in image picker now works
diff --git a/application/assets/js/tiny_mce/plugins/fizzymedia/js/dialog.js b/application/assets/js/tiny_mce/plugins/fizzymedia/js/dialog.js index 4782a6e..c906e39 100644 --- a/application/assets/js/tiny_mce/plugins/fizzymedia/js/dialog.js +++ b/application/assets/js/tiny_mce/plugins/fizzymedia/js/dialog.js @@ -1,67 +1...
jtietema/Fizzy
80fb2dc9b857e5cbc18602aa63276be0751f7f84
Fizzy Filters
diff --git a/application/library/Fizzy/Filter/Slugify.php b/application/library/Fizzy/Filter/Slugify.php index 34bd554..535495d 100644 --- a/application/library/Fizzy/Filter/Slugify.php +++ b/application/library/Fizzy/Filter/Slugify.php @@ -1,44 +1,44 @@ <?php /** * Class Fizzy_Filter_Slugify * @category Fizzy ...
jtietema/Fizzy
ad2cfab820e60ba230312ac9631153adad6ebda2
Image rotate
diff --git a/application/library/Fizzy/Image.php b/application/library/Fizzy/Image.php index 090c264..552d1f3 100644 --- a/application/library/Fizzy/Image.php +++ b/application/library/Fizzy/Image.php @@ -1,281 +1,283 @@ <?php /** * Class Fizzy_Image * @package Fizzy * * LICENSE * * This source file is su...
jtietema/Fizzy
01e16280ab391881bd9b11435449a040da29b557
Fizzy_Image
diff --git a/application/library/Fizzy/Image.php b/application/library/Fizzy/Image.php new file mode 100644 index 0000000..090c264 --- /dev/null +++ b/application/library/Fizzy/Image.php @@ -0,0 +1,281 @@ +<?php +/** + * Class Fizzy_Image + * @package Fizzy + * + * LICENSE + * + * This source file is subject to the new...
jtietema/Fizzy
9f09d3fc6f1e7018e25f2914f680b1df323932b3
removed the upload folder setting
diff --git a/application/library/Fizzy.php b/application/library/Fizzy.php index cbc2ea2..d4e5380 100644 --- a/application/library/Fizzy.php +++ b/application/library/Fizzy.php @@ -1,645 +1,644 @@ <?php /** Zend_Config */ require_once 'Zend/Config.php'; /** * Fizzy application class. Takes care of gathering a...
jtietema/Fizzy
fa8c097f92cad73b3e32eeac8c92f2a458c81c37
auth namespace support in securedcontroller
diff --git a/application/library/Fizzy/SecuredController.php b/application/library/Fizzy/SecuredController.php index 3767378..b4a60c9 100644 --- a/application/library/Fizzy/SecuredController.php +++ b/application/library/Fizzy/SecuredController.php @@ -1,53 +1,69 @@ <?php /** * Class Fizzy_SecuredController * @pa...
jtietema/Fizzy
a1153144185dd934b2e0ee91b3111b157e0fff0a
doctrine cli now uses fizzy config
diff --git a/doctrine b/doctrine index c6d9ab7..8cd6a3d 100755 --- a/doctrine +++ b/doctrine @@ -1,26 +1,31 @@ #!/usr/bin/env php <?php define('APPLICATION_PATH', realpath(dirname(__FILE__) . '/application')); define('LIBRARY_PATH', realpath(APPLICATION_PATH . '/library')); set_include_path(LIBRARY_PATH . PATH...
jtietema/Fizzy
917345f420836a5a48bf7bc244213af226895637
Refactored password confirm validator to generic field validator
diff --git a/application/library/Fizzy/Validate/PasswordConfirm.php b/application/library/Fizzy/Validate/EqualsField.php similarity index 87% rename from application/library/Fizzy/Validate/PasswordConfirm.php rename to application/library/Fizzy/Validate/EqualsField.php index 8ba652f..768bed4 100644 --- a/application/li...
jtietema/Fizzy
5e1ed942c72fee1f62f49f8d6373d401af0f23d2
Fixed typo in setModelClass function
diff --git a/application/library/Fizzy/Doctrine/AuthAdapter.php b/application/library/Fizzy/Doctrine/AuthAdapter.php index d741a79..ac44fde 100644 --- a/application/library/Fizzy/Doctrine/AuthAdapter.php +++ b/application/library/Fizzy/Doctrine/AuthAdapter.php @@ -1,71 +1,71 @@ <?php /** * Auth adapter for Doctrine...
jtietema/Fizzy
fec174f355f95f37fef7ac6b8075819ee86df12a
implemented contact form
diff --git a/application/library/Fizzy.php b/application/library/Fizzy.php index 27850c2..cbc2ea2 100644 --- a/application/library/Fizzy.php +++ b/application/library/Fizzy.php @@ -1,582 +1,589 @@ <?php /** Zend_Config */ require_once 'Zend/Config.php'; /** * Fizzy application class. Takes care of gathering a...
jtietema/Fizzy
9ba48dea17724b7143abe7b856afb22bbcc2473d
fixed pages controller frontend
diff --git a/application/modules/default/controllers/PagesController.php b/application/modules/default/controllers/PagesController.php index 0bf6b34..a0bec2d 100644 --- a/application/modules/default/controllers/PagesController.php +++ b/application/modules/default/controllers/PagesController.php @@ -1,34 +1,35 @@ <?ph...
jtietema/Fizzy
b9b692363e80f40556278ee3b2347c0469b99f5e
removed commented code
diff --git a/application/library/Fizzy.php b/application/library/Fizzy.php index 503dbef..27850c2 100644 --- a/application/library/Fizzy.php +++ b/application/library/Fizzy.php @@ -21,628 +21,618 @@ class Fizzy * @var array */ protected $_bootstrap = array ( 'autoLoader' => null, 'reg...
jtietema/Fizzy
9c3fb09a04d73b8f0b36d19609aecc108a6fc97c
ported backend to Doctrine
diff --git a/application/library/Fizzy.php b/application/library/Fizzy.php index 9b18e32..503dbef 100644 --- a/application/library/Fizzy.php +++ b/application/library/Fizzy.php @@ -10,625 +10,639 @@ require_once 'Zend/Config.php'; * @todo find a better way to support environments * * @author Mattijs Hoitink <matt...
jtietema/Fizzy
8f0d4df33fe06884f914f30250105691a5ff3ce3
added default page template
diff --git a/application/templates/page.phtml b/application/templates/page.phtml new file mode 100644 index 0000000..28f317e --- /dev/null +++ b/application/templates/page.phtml @@ -0,0 +1,4 @@ +<h1><?= $this->page->title ?></h1> +<div> +<?= $this->page->body ?> +</div>
jtietema/Fizzy
23157d7c4be35bcd19ebe450d507f594ac9d1c8a
styling frontend now works again
diff --git a/application/modules/default/views/layouts/default.phtml b/application/modules/default/views/layouts/default.phtml index e69de29..f2c2c07 100644 --- a/application/modules/default/views/layouts/default.phtml +++ b/application/modules/default/views/layouts/default.phtml @@ -0,0 +1,66 @@ +<?php +/** + * Defaul...
jtietema/Fizzy
52a8ee4322f5f9c33484835892991112e7d5b669
MySQL schema and some fixes in SQLite backend
diff --git a/application/library/Fizzy/Storage/Backend/Sqlite.php b/application/library/Fizzy/Storage/Backend/Sqlite.php index 808f950..e0bcb79 100644 --- a/application/library/Fizzy/Storage/Backend/Sqlite.php +++ b/application/library/Fizzy/Storage/Backend/Sqlite.php @@ -1,58 +1,58 @@ <?php /** * Class Fizzy_Stora...
jtietema/Fizzy
e899d13e6c283d1686ca48c21e1419e323cbb9b4
Layouts loaded based on requested module
diff --git a/application/library/Fizzy.php b/application/library/Fizzy.php index 02b2e34..9b18e32 100644 --- a/application/library/Fizzy.php +++ b/application/library/Fizzy.php @@ -1,642 +1,634 @@ <?php /** Zend_Config */ require_once 'Zend/Config.php'; /** * Fizzy application class. Takes care of gathering a...
jtietema/Fizzy
726864f8b9bf633e2643ffe2aa4d88c558b4259b
Style update for flashmessages
diff --git a/application/assets/css/fizzy.css b/application/assets/css/fizzy.css index 2109d82..77d67fd 100644 --- a/application/assets/css/fizzy.css +++ b/application/assets/css/fizzy.css @@ -1,363 +1,363 @@ @import 'screen.css'; html, body { margin: 0; padding: 0; background-color: #777777; fo...
jtietema/Fizzy
f619628706979a3861206c04b64ccf575cfb76fe
Flash message support
diff --git a/application/assets/css/fizzy.css b/application/assets/css/fizzy.css index 6c1ab8a..2109d82 100644 --- a/application/assets/css/fizzy.css +++ b/application/assets/css/fizzy.css @@ -1,346 +1,363 @@ @import 'screen.css'; html, body { margin: 0; padding: 0; background-color: #777777; fo...
jtietema/Fizzy
14cd3ef8eee9efdcab1ac485f1297e1f4d95b248
integrate wysiwyg into custom form element
diff --git a/application/assets/js/fizzy.js b/application/assets/js/fizzy.js index e69de29..5b8482f 100644 --- a/application/assets/js/fizzy.js +++ b/application/assets/js/fizzy.js @@ -0,0 +1,39 @@ +var Fizzy = function(){ + var _editors = []; + + return { + "wysiwyg" : { + "count" : functio...
jtietema/Fizzy
3211be001327571db0ab0c874a8baaa3cd70ff9e
New Validator and Filter for page form
diff --git a/application/library/Fizzy/Filter/Slugify.php b/application/library/Fizzy/Filter/Slugify.php new file mode 100644 index 0000000..34bd554 --- /dev/null +++ b/application/library/Fizzy/Filter/Slugify.php @@ -0,0 +1,44 @@ +<?php +/** + * Class Fizzy_Filter_Slugify + * @category Fizzy + * @package Fizzy_Filter ...
jtietema/Fizzy
9e501173bbccd3f0afc45317242c9d75c4a77790
Added doxygen configuration
diff --git a/.gitignore b/.gitignore index 641dfb1..dc71e5b 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ configs/fizzy.ini data/*.xml +data/docs diff --git a/data/doxygen.conf b/data/doxygen.conf new file mode 100644 index 0000000..45d147d --- /dev/null +++ b/data/doxygen.conf @@ -0,0 +1,259 @@ +#--------...
jtietema/Fizzy
61e33f46c138515207569469aa8d444de462d60b
Form controlls
diff --git a/application/library/Fizzy/Form.php b/application/library/Fizzy/Form.php new file mode 100644 index 0000000..db6d76d --- /dev/null +++ b/application/library/Fizzy/Form.php @@ -0,0 +1,42 @@ +<?php +/** + * Class Fizzy_Form + * @category Fizzy + * @package Fizzy_Form + * + * LICENSE + * + * This source file i...
jtietema/Fizzy
f20985f95fb92f1d3dfb29f15acdbad6ddd7d372
Added layout for login page
diff --git a/application/assets/css/fizzy.css b/application/assets/css/fizzy.css index 47795c0..6c1ab8a 100644 --- a/application/assets/css/fizzy.css +++ b/application/assets/css/fizzy.css @@ -1,345 +1,346 @@ @import 'screen.css'; html, body { margin: 0; padding: 0; background-color: #777777; fo...
jtietema/Fizzy
31926552854d056fba1679ff0ca1e5617c9337c3
Fizzy_Storage auth adapter
diff --git a/application/library/Fizzy.php b/application/library/Fizzy.php index cdeac28..e8942aa 100644 --- a/application/library/Fizzy.php +++ b/application/library/Fizzy.php @@ -1,632 +1,634 @@ <?php /** Zend_Config */ require_once 'Zend/Config.php'; /** * Fizzy application class. Takes care of gathering a...
jtietema/Fizzy
b4898142fc06438a139a2722a0954cfb4b937251
added default uploads folder to default config
diff --git a/configs/fizzy.xml.default b/configs/fizzy.xml.default index b826cc0..113a78b 100644 --- a/configs/fizzy.xml.default +++ b/configs/fizzy.xml.default @@ -1,14 +1,17 @@ <?xml version="1.0" encoding="UTF-8"?> <fizzy version="1.1"> <application> <title>Fizzy</title> <environment>product...
jtietema/Fizzy
d8acc0b68f91dcc35184eb00ba4d807b1e0944e7
saving an existing page now updates correctly
diff --git a/application/library/Fizzy/Storage.php b/application/library/Fizzy/Storage.php index 8e5c5e8..a9bc663 100644 --- a/application/library/Fizzy/Storage.php +++ b/application/library/Fizzy/Storage.php @@ -1,303 +1,303 @@ <?php /** * Class Fizzy_Storage * @package Fizzy * @subpackage Storage * * LICE...
jtietema/Fizzy
021b9bc0a6cef66d22e4f11d90ae567d984ae190
added upload path to default xml
diff --git a/configs/fizzy.xml.default b/configs/fizzy.xml.default index b826cc0..113a78b 100644 --- a/configs/fizzy.xml.default +++ b/configs/fizzy.xml.default @@ -1,14 +1,17 @@ <?xml version="1.0" encoding="UTF-8"?> <fizzy version="1.1"> <application> <title>Fizzy</title> <environment>product...
jtietema/Fizzy
2069128c51f079518efb2d878db7661f53975ad0
Media Controller
diff --git a/application/configs/application.ini b/application/configs/application.ini deleted file mode 100644 index e69de29..0000000 diff --git a/application/configs/routes.ini b/application/configs/routes.ini deleted file mode 100644 index 48f3e4a..0000000 --- a/application/configs/routes.ini +++ /dev/null @@ -1,39 ...
jtietema/Fizzy
eef95006ff454ac3b095e4c444ce0567951ee5d3
edit support in WYSIWYG Fizzy Media plugin
diff --git a/application/views/assets/js/tiny_mce/plugins/fizzymedia/js/dialog.js b/application/views/assets/js/tiny_mce/plugins/fizzymedia/js/dialog.js index ab2bfb3..4782a6e 100644 --- a/application/views/assets/js/tiny_mce/plugins/fizzymedia/js/dialog.js +++ b/application/views/assets/js/tiny_mce/plugins/fizzymedia/...
jtietema/Fizzy
17b715901863fcad63daaa5955d63d6ccfbbd22b
initial version WYSIWYG integration
diff --git a/application/controllers/AdminMediaController.php b/application/controllers/AdminMediaController.php index f21a2b8..61fdca8 100644 --- a/application/controllers/AdminMediaController.php +++ b/application/controllers/AdminMediaController.php @@ -1,157 +1,195 @@ <?php /** * Class AdminMediaController * ...
jtietema/Fizzy
cef8572f460c309258a10d1f6c2019788f6a7860
fixes icons in user view
diff --git a/application/views/scripts/admin/users.phtml b/application/views/scripts/admin/users.phtml index 0f079bd..10b3387 100644 --- a/application/views/scripts/admin/users.phtml +++ b/application/views/scripts/admin/users.phtml @@ -1,46 +1,46 @@ <?php /** * Admin users view * @package Fizzy * @subpackage V...
jtietema/Fizzy
7a5ec7c63031d3798d3ce8b282e3fb549d5145c3
fixes icons in user view
diff --git a/application/views/scripts/admin/users.phtml b/application/views/scripts/admin/users.phtml index 0f079bd..10b3387 100644 --- a/application/views/scripts/admin/users.phtml +++ b/application/views/scripts/admin/users.phtml @@ -1,46 +1,46 @@ <?php /** * Admin users view * @package Fizzy * @subpackage V...
jtietema/Fizzy
256aa1441bcb14edf90de0cd968c3300a98b6bf3
fixed icons in Media Gallery
diff --git a/application/views/assets/images/icon/page_white_text.png b/application/views/assets/images/icon/page_white_text.png new file mode 100644 index 0000000..6a890d5 Binary files /dev/null and b/application/views/assets/images/icon/page_white_text.png differ diff --git a/application/views/scripts/admin/media/lis...
jtietema/Fizzy
31fc422c9abf66d02dd446324ce514c04fe7a714
menubar background is now shown correctly
diff --git a/application/views/assets/css/admin.css b/application/views/assets/css/admin.css index d04094a..ade8b57 100644 --- a/application/views/assets/css/admin.css +++ b/application/views/assets/css/admin.css @@ -1,314 +1,314 @@ @import 'admin-screen.css'; html, body { margin: 0; padding: 0; back...
jtietema/Fizzy
0bf93ab3ea719d00645819266151570e2423a576
closed td properly
diff --git a/application/views/scripts/admin/media/list.phtml b/application/views/scripts/admin/media/list.phtml index 2cddb5d..d2a5d01 100644 --- a/application/views/scripts/admin/media/list.phtml +++ b/application/views/scripts/admin/media/list.phtml @@ -1,118 +1,119 @@ <?php // file type image declarations $typ...
jtietema/Fizzy
de1f6c8f0102c30f91bed2631a5d191bc62629c1
removed lost character in AdminMediaController
diff --git a/application/controllers/AdminMediaController.php b/application/controllers/AdminMediaController.php index 37e47d3..0f4e9eb 100644 --- a/application/controllers/AdminMediaController.php +++ b/application/controllers/AdminMediaController.php @@ -1,144 +1,144 @@ <?php /** * Class AdminMediaController * ...
jtietema/Fizzy
8991ac214647fe7ee3d904a76f6f7143848ebf3a
implements thumbnail view in media gallery
diff --git a/application/controllers/AdminAssetsController.php b/application/controllers/AdminAssetsController.php index 237abb2..daba226 100644 --- a/application/controllers/AdminAssetsController.php +++ b/application/controllers/AdminAssetsController.php @@ -1,136 +1,138 @@ <?php /** * Class AdminAssetsController...
jtietema/Fizzy
3c7ee4f3927a1df470e488611f68b212f70f691a
bugfixes and update README and CHANGELOG
diff --git a/CHANGELOG.txt b/CHANGELOG.txt new file mode 100644 index 0000000..33f3229 --- /dev/null +++ b/CHANGELOG.txt @@ -0,0 +1,26 @@ +Version 1.1.0 +============= +There has been some major improvements in the storage backend. New is MySQL +support and improved SQLite support. Also the WYSIWYG editor changed to ...
jtietema/Fizzy
21f6f02a100879f7bc18428b01bc006b208b13c5
Admin assets
diff --git a/application/controllers/AdminAssetsController.php b/application/controllers/AdminAssetsController.php new file mode 100644 index 0000000..c3a1432 --- /dev/null +++ b/application/controllers/AdminAssetsController.php @@ -0,0 +1,136 @@ +<?php +/** + * Class AdminAssetsController + * @package Fizzy + * @subpa...
jtietema/Fizzy
08cfbe9512f8d9bb5de0ff16f075d6c8da4d379a
Default configuration
diff --git a/configs/fizzy.xml.default b/configs/fizzy.xml.default index 2345380..b826cc0 100644 --- a/configs/fizzy.xml.default +++ b/configs/fizzy.xml.default @@ -1,15 +1,14 @@ <?xml version="1.0" encoding="UTF-8"?> -<fizzy version="0.4"> +<fizzy version="1.1"> <application> <title>Fizzy</title> - ...
jtietema/Fizzy
d817e07995ba4ca8c3a4296ae4b34367d42e8940
Storage backend relative paths:
diff --git a/application/library/Fizzy/Storage/Backend/Pdo.php b/application/library/Fizzy/Storage/Backend/Pdo.php index 9fe4c9e..dbaca8c 100644 --- a/application/library/Fizzy/Storage/Backend/Pdo.php +++ b/application/library/Fizzy/Storage/Backend/Pdo.php @@ -1,269 +1,267 @@ <?php /** * Class Fizzy_Storage_Backend...
jtietema/Fizzy
79048c33e7dc852911ee91108ac9863e37f205d2
Base path:
diff --git a/application/Fizzy.php b/application/Fizzy.php index dcde28e..47c935b 100644 --- a/application/Fizzy.php +++ b/application/Fizzy.php @@ -1,54 +1,62 @@ <?php /** * Fizzy bootstrap file. * @package Fizzy * * LICENSE * * This source file is subject to the new BSD license that is bundled * with ...
danieljfarrell/website-2.0
06cf392f258fac2fee97246a5085cbcec7a2f9f6
Swapped the order of the items in the experience section on the front page
diff --git a/index.html b/index.html index dc93877..615b66e 100644 --- a/index.html +++ b/index.html @@ -1,88 +1,88 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd"> <html lang="en"> <head> <meta http-equiv="Content-Type" content="text/html; charset=utf-8"> ...
danieljfarrell/website-2.0
958a024bc1b5bfe3318b1cd935be574afdb308ab
Bringing over some files from the online version.
diff --git a/contact/index.html b/contact/index.html index 94c6dec..85daf83 100644 --- a/contact/index.html +++ b/contact/index.html @@ -1,90 +1,105 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd"> <html lang="en"> <head> <meta http-equiv="Content-Type" cont...
danieljfarrell/website-2.0
ffe76e2d605f9a0bff7d92fdcb631b36d947fc62
Added Google Analytics and removed lightbox (because it didn't work).
diff --git a/contact/index.html b/contact/index.html index 94c6dec..85daf83 100644 --- a/contact/index.html +++ b/contact/index.html @@ -1,90 +1,105 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd"> <html lang="en"> <head> <meta http-equiv="Content-Type" cont...
danieljfarrell/website-2.0
7949a9dabd65feaff52e736007c0266d342f5740
Fixing some typos
diff --git a/blueprint/.DS_Store b/blueprint/.DS_Store index 34cc118..83ad512 100644 Binary files a/blueprint/.DS_Store and b/blueprint/.DS_Store differ diff --git a/blueprint/plugins/.DS_Store b/blueprint/plugins/.DS_Store index 32ccb90..216fcd2 100644 Binary files a/blueprint/plugins/.DS_Store and b/blueprint/plugins...