Commit Graph

80 Commits

Author SHA1 Message Date
Dirk Kelly
04b0849dc5 Added the liquid tag for content, retrieves an editable element from self or parent if inherited: true 2011-03-02 08:14:58 +08:00
Dirk Kelly
70104e8f9d Merge branch 'master' of github.com:locomotivecms/engine 2011-02-28 12:49:54 +08:00
Dirk Kelly
0b11a3813b simplified the theme_image_tag a little 2011-02-28 12:09:42 +08:00
did
ebc40d1682 the site drop has access to pages 2011-02-27 17:14:14 +01:00
Dirk Kelly
6070da8a5c added some helper methods to content_types liquid drops (via @KarlBright) 2011-02-25 11:47:12 +08:00
did
2f72d26d4c Merge branch 'master' of https://github.com/karlbright/engine into karlbright-master 2011-02-19 00:58:13 +01:00
did
bd992cc882 fix issue #37 plus other ones related to theme assets and assets 2011-02-19 00:51:57 +01:00
karlbright
9d11d9e019 Added theme_image_tag liquid tag to make it easy to insert theme image files 2011-02-15 15:33:52 +08:00
did
083debc516 add seo_metadata liquid tag (Mario) 2011-02-13 14:40:55 +01:00
did
94be90986d merge Dirk's branch + upgrade a lot of gems (rails, ...etc) 2011-02-12 15:00:57 +01:00
Dirk Kelly
7bce392e56 moved to the listed methods in the nav 2011-02-01 16:07:56 +08:00
Dirk Kelly
2d3c0e974f not showing unlisted pages in the nav 2011-02-01 14:43:07 +08:00
dinedine
02039159d7 add getter to the size of an asset collection in liquid 2011-01-30 00:30:24 +01:00
dinedine
2e774b2a97 conflict between the index scope in the page model and the mongoid index method 2011-01-27 10:49:42 +01:00
Dirk Kelly
7d529f22d7 I can't believe I missed the include_page? method.
Now supports exactly the same standards as the top level list elements, such as unpublished and excluded urls
2011-01-25 07:54:07 +08:00
Dirk Kelly
825521a5d4 need to reject templatized pages, because they're not real pages.
Also using children with minimal attributes, like top level.
2011-01-24 23:20:26 +08:00
Dirk Kelly
f512b417f5 added the depth option to nav tag 2011-01-24 17:00:02 +08:00
dinedine
85bee3a110 Merge branch 'add_or_update_editable_element' of https://github.com/dirkkelly/locomotive into dirkkelly-add_or_update_editable_element 2011-01-18 00:28:41 +01:00
Dirk Kelly
62568bbdbb Fixed exception when updating a layout from back-office which contained an editable area 2011-01-14 15:27:58 +08:00
dinedine
3686496bb2 still got errors with dates display + admin default root points to signin 2011-01-11 12:42:12 +01:00
dinedine
ff01539bb5 date in content types compatible with ruby 1.9.2 2011-01-11 00:50:42 +01:00
dinedine
1291b68aba in special sitation inherited templates were not correctly updated 2011-01-08 00:10:44 +01:00
dinedine
c828301f37 fonts did not work when stored in amazon s3 2011-01-03 21:53:33 +01:00
dinedine
572ee360a1 preserve page orders when importing theme + handle favicon as theme asset + add tests for the nav tag + polish code (remove useless logs) 2011-01-03 11:50:09 +01:00
dinedine
210ce3d2d8 enhance the nav tag + some optimization in the back-office when rendering the pages tree 2011-01-02 23:58:06 +01:00
dinedine
bbb09b58cf ruby 1.9.2 compliant 2010-11-08 18:42:14 +01:00
dinedine
a1d9a5d548 reflect changes from the last imported theme (enhancements + bugs fixed) 2010-10-31 00:30:30 +02:00
dinedine
cc0b50e22e add rspec tests for the import module + debug the cms to handle correctly the default theme 2010-10-29 01:36:45 +02:00
dinedine
680a42b8f5 first attempt of an installation wizzard 2010-10-27 02:11:44 +02:00
dinedine
7cb26a74d4 fix bug with pagination + add _permalink property for content instances 2010-10-26 15:06:57 +02:00
dinedine
b4d3aae46f order assets when used in liquid templates 2010-10-19 16:56:50 +02:00
dinedine
c1b21fac8b use BSON::ObjectId to find elements (asset collection, content type) + make the import module work with S3 2010-10-19 12:20:09 +02:00
dinedine
a03dd77a65 update gem dependencies + gemspec + liquid tags (stylesheet_tag, ...etc) work with amazon S3 2010-10-16 11:27:26 +02:00
dinedine
1c86db05f8 polish the import module + some code refactoring / cleaning 2010-10-12 02:12:18 +02:00
dinedine
54063d6b46 create a middleware for serving fonts (solve cross domain issue) + add cache for consume liquid tag + fix image picker 2010-10-11 16:26:46 +02:00
dinedine
86ac74e290 bugs when accessign assets from asset collections in templates + uploader for custom fields was buggy 2010-10-11 01:16:43 +02:00
dinedine
ecfa466074 add missing asset collections import module + add google analytics import + work on simplifying the theme asset logic 2010-10-07 02:45:41 +02:00
dinedine
eabe4903f3 refactor locomotive liquid drops + implement the theme or site import page (95% done) 2010-09-29 00:08:11 +02:00
dinedine
a5ea70229c allows to disable import sub tasks + new images tag logic (in progress) + handle errors when importing 2010-09-28 10:09:49 +02:00
Didier Lafforgue
e31012f861 fix a lot of tiny bugs (not yet) + testing import tool 2010-09-27 00:31:50 +02:00
dinedine
d5223e5c91 skinning tinymce to match locomotive style 2010-09-06 23:47:03 +02:00
dinedine
eb81a5041f clean the inline editor js code (namespace toolbar functions, ...etc) 2010-09-06 14:22:13 +02:00
dinedine
dad944d625 tiny patch for aloah-editor (span behaves like b tags) + enhance inline editor js (locale, spinner when saving, better ui, ...etc) 2010-09-06 00:50:05 +02:00
dinedine
fc7fef8ba3 saving editable text elements works 2010-09-05 01:50:11 +02:00
dinedine
1e8376d18f page toolbar for live editing 2010-09-04 01:47:28 +02:00
dinedine
9967e9d3d3 first attempt to build the inline editor module 2010-09-03 01:03:20 +02:00
dinedine
35b4e5358c editable_file tag is implemented + remove not used editable elements all in once for better performance + default content inherits from the content of the parent element 2010-08-31 23:53:30 +02:00
dinedine
335d7a1aac fix a major bug when updating template children which have the same parent + remove debug output + rspec tests pass 2010-08-31 01:56:54 +02:00
dinedine
d7aba616f6 editable long text implemented + refactoring + ui 2010-08-30 01:41:44 +02:00
dinedine
af5fe62d89 clean and improve the ui concerning the editable elements of a page + fix bugs and refactor a bit 2010-08-28 02:00:05 +02:00