Skip to content


Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP

Comparing changes

Choose two branches to see what's changed or to start a new pull request. If you need to, you can also compare across forks.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also compare across forks.
base fork: resolve/refinerycms
head fork: resolve/refinerycms
Checking mergeability… Don't worry, you can still create the pull request.
This comparison is big! We're only showing the most recent 250 commits
Commits on Nov 16, 2009
@avit avit Handle only supported (html) format
Signed-off-by: Philip Arndt <>
@parndt parndt whitespace 1c72bf1
@parndt parndt whitespace f06ba81
@parndt parndt Fix Issue #22 1be3ff4
@parndt parndt Bump version to 8cc69c3
Commits on Nov 17, 2009
@parndt parndt Fix edge case when running refinery task 3a8b48b
@parndt parndt Fix bug where redirecting to first child would crash out due to new r…
…espond_to code
Commits on Nov 18, 2009
@parndt parndt Updated images and resources plugin to group files by date uploaded i…
…n list view if a refinery setting is set to true to allow them. Fixed the HTML Truncation on the news section by adding a third party library and integrating it into the Refinery core. Updated WYMeditor to fix an issue where highlighting a link would not recognise it as a link when using dialogues (only for mozilla browsers currently -- Safari already worked). Improved refinery-update-core task by allowing it to hook into the environment file to add any new gems used by Refinery. Added dependency to Hpricot gem for use with the HTML parser (hpricot version 0.8.1).
@parndt parndt Fix bug that was preventing the truncation passing all of its argumen…
…ts to super.
@parndt parndt Fix bugs in truncation helper where it wouldn't properly detect that …
…preserve_html_tags was requested
Commits on Nov 19, 2009
@parndt parndt unified the form-actions part of the form by splitting the parts up i…
…nto partials. Fixed Issue #23 and Issue #24. Save and continue is now something that you can easily place on any admin form and runs using AJAX so that the page doesn't refresh ala Issue #24. Fixed an issue where tooltips were being created multiple times by wymeditor. Fixed a select tag issue in Firefox where the padding that was added was distorting the display.
@avit avit Cleaned up file list in gemspec
Files on separate lines makes it easier to track diffs.

Signed-off-by: Philip Arndt <>
@avit avit Added rake task to convert tabs and strip whitespace
Signed-off-by: Philip Arndt <>
@avit avit whitespace: global cleanup
Signed-off-by: Philip Arndt <>
@parndt parndt tabs to spaces in JS+CSS+HTML files 7addb51
@parndt parndt Merge branch 'avit/master' 16336c3
@parndt parndt updated version and date 1239858
@parndt parndt Improved the appearance of the images form in/out of dialogs and the …
…recent activity list for long time_ago_in_words results
Commits on Nov 23, 2009
@parndt parndt Remove logger statements and specify the exact gem we want. e142b91
@parndt parndt Support onpaste for firefox and make it format a block if content is …
…pasted like it does already on keyup
@parndt parndt cleanup files a bit 9f66a86
@parndt parndt Release little, release often. 538c46a
Commits on Nov 24, 2009
@parndt parndt Fix a case where the wymeditor fields were not getting updated proper…
…ly when using save and continue. Moved continue_editing javascript to admin.js and we are using jQuery for many of the functions inside admin.js now.
Commits on Nov 25, 2009
@parndt parndt Don't load slim_scrooge when running on mswin 72f77da
@parndt parndt Finally fix the issue where if Refinery is subclassed in any way in d…
…evelopment mode then it would present a nice 'A copy of ClassName has been removed from the module tree but is still active' message. Now engines are reloaded every time so subclassing/overriding internals should work just fine. No change when running in test or production mode.
Commits on Nov 27, 2009
@parndt parndt Put init.rb files in their correct directories (under rails/) because…
… this works if they're engines or whether they're in a gem. Added new refinery-override task which allows the developer to easily override rails core components.
@parndt parndt Add new content page partial which pages can render for easier overri…
…ding of the global markup.
@parndt parndt use the new content page partial. a00c9f0
Commits on Nov 30, 2009
@parndt parndt Added a page container for the page to sit in to provide more flexibi…
…lity for CSS.
@parndt parndt Added down for maintenance page and refinery setting to allow the fro…
…ntend to be taken down for maintenance. Updated Rails requirement to 2.3.5 to keep things up to date.
@parndt parndt Add paragraph tags 4e7616e
@parndt parndt added migration to gemspec 4d3ec94
@parndt parndt set a minimum and maximum width on the time_ago field in refinery bac…
…kend for recent_activity. Also cleaned up the file.
@parndt parndt increase max width and use a shorter truncate 556a943
@parndt parndt ensure the session and users controllers don't get taken down for mai…
@parndt parndt accurately match the gems in the environment file when using refinery…
…-update-core in a gemified project.
Commits on Dec 01, 2009
@parndt parndt Updated gems in readme dd0b900
Commits on Dec 02, 2009
@parndt parndt get rid of debug statement f3e84cb
@parndt parndt provide helpful feedback on why a page can't be destroyed if it can't…
… be destroyed and provide a method for getting rid of a page using destroy with a bang.
@parndt parndt fix indentation on s.files 9af399c
Commits on Dec 03, 2009
@parndt parndt Version bump to 0.0.0 12e6673
Commits on Dec 06, 2009
@parndt parndt switch to jeweler for the gem building 74284bf
@parndt parndt Change to using the proper plugin e577217
@parndt parndt add this to css 49cfb66
@parndt parndt Added option to image picker to allow a link to toggle the display of…
… the image.
@parndt parndt prevent rows being added to the user_plugins table if the user_id is …
@parndt parndt provide some protection where the home page is nil 19489a7
@parndt parndt Update rails_indexes plugin to use new fork which provides better out…
…put when no models found.
@parndt parndt provide the ability for lib/tasks to run within vendor/plugins when t…
…he project is installed from a gem and remove the require statement from the indexer rake task as this is now redundant.
@parndt parndt Load in all of the tasks from vendor plugins if the project is runnin…
…g in a gem and no longer do we need to create a lib/tasks directory or copy any tasks into the destination project. PLEASE ENSURE REFINERY CORE TASKS IN lib/tasks THAT WERE PREVIOUSLY COPIED ARE REMOVED.
@parndt parndt bump version eea837f
Commits on Dec 07, 2009
@parndt parndt slim_scrooge was updated to accomodate Ygor's request for Windows so …
…use this new version and remove the no-windows constraint (commented out for now).
@parndt parndt Add the notion of a superuser which is usually the first user created…
…. There's also a new migration to support this, ensure you run it.
@parndt parndt make use of new CSS class .page_not_live 9e8a6bb
@parndt parndt update gem requirements 5a42ddb
Commits on Dec 08, 2009
@parndt parndt fix paste from word (webkit+gecko tested) ceb2c0a
@parndt parndt version bump be8c523
@parndt parndt Don't display sections if they're empty. 10cf7e1
@parndt parndt Update refinery-update-core task to include the refinery wymeditor. 13aa452
Commits on Dec 09, 2009
@parndt parndt Don't load up draft pages or pages that are hidden in the top_level p…
Commits on Dec 10, 2009
@parndt parndt Allow the application to access rake tasks belonging to gems used by …
…Refinery. Should fall back to the original way of doing things if there's a problem with it.
@parndt parndt Only output warnings on production logging. Disable this per-site if …
…you want.
Commits on Dec 14, 2009
@parndt parndt added location in admin layout's head for developers to inject anythi…
…ng they want. E.g. this could be used to inject custom_wymeditor_boot_options which are now supported by boot_wym, say for changing the wymeditor skin or specifying more items for the CSS option.
Commits on Dec 15, 2009
@djones djones what I imagine a theme should look like 2c099e3
@djones djones skeleton for the themes plugin f1f0c7b
Commits on Dec 16, 2009
@parndt parndt People don't really need jeweler 5c2b49a
@parndt parndt reduce the size of admin tabs by a little bit (they didn't need to be…
… that big)
@parndt parndt Make the default menu_match field exist when using generator and make…
… it really accurate
@parndt parndt Set the position field to the maximum position + 1 when creating a ne…
…w object if the position field exists
@parndt parndt version bump 91986ac
Commits on Dec 18, 2009
@parndt parndt Doesn't seem like we need unicode gem anymore, can everyone confirm t…
…his please?
@parndt parndt create some more graceful effects using jQuery instead of prototype (…
…this is the way we're heading for everything that's currently prototype)
@parndt parndt Added resource caching for admin layout (for now) which is disabled b…
…y default and controllable via refinery setting
@parndt parndt put in place new google analytics code using the asynchronous methods… d9d5fdc
@parndt parndt bump build version f2e255d
@parndt parndt being careful about placement of analytics.. apparently <link /> tags…
… may break it so putting it before those. (Thanks Sam)
Commits on Dec 20, 2009
@parndt parndt support flashvars in an embed code 2561247
Commits on Dec 21, 2009
@parndt parndt Paste from word now pastes in the right direction and replace_me_with…
…_wym-123123123 tags now get removed properly on save
@parndt parndt This fixes the issue where Internet Explorer browsers are presented w…
…ith a basic auth dialogue rather than the xhtml one that they *can* accept but don't think they can.
Commits on Dec 22, 2009
@parndt parndt specify urls for when the action fails to be picked up by javascript 6e73786
@parndt parndt no longer supporting lightbox in core 14ee00a
Commits on Dec 23, 2009
@parndt parndt move jquery out of the folder it was in, seemed superfluous, and migr…
…ated another function to jquery.
@parndt parndt fix init_tooltips so that it works properly with jQuery f4e0370
@parndt parndt version bump 142bc37
Commits on Jan 04, 2010
@parndt parndt combine rules 218fa07
Commits on Jan 05, 2010
Ben Tucker make tab links for plugins with spaces in their names work out of the…
… box
Commits on Jan 10, 2010
Steven Heidel Fixed down migration in plugins generated by refinery-generator e80158d
Commits on Jan 11, 2010
@parndt parndt added better tracing of errors on dashboard and do more to try to pre…
…vent these errors
@parndt parndt refactored core crud library to make it much more easily understandab…
…le and provide more options to control what's going on without overriding. Migrated some functionality over to make use of it and more will follow.
@parndt parndt remove testing switch 672cb0f
@parndt parndt shorten using collect dbab5b2
Commits on Jan 12, 2010
@parndt parndt use send rather than eval e653171
@parndt parndt convert to jQuery equivalent ee11e81
@parndt parndt convert to jquery equivalent. 110a5b3
@parndt parndt convert to jQuery equivalent 151fc03
@djones djones Merge branch 'master' of into them…
@parndt parndt don't reload plugins, the plugin loader code seems to be fixing the m…
…odule tree errors.
@djones djones Merge branch 'master' of into them…
@parndt parndt add some fragment caching to the menu and set a function to expire it…
… when a page is created/updated/destroyed
@djones djones theme support now working from the back end only. Just set the settin…
…g 'theme' to the name of the theme you have in your /themes directory and it will use that instead
@djones djones Merge branch 'master' of into them…
@parndt parndt switch to alias_attribute which does the same thing as before but in …
…the proper way.
Steven Heidel Tried to make it easier to implement refinery on Heroku, unfortunatel…
…y it still fails to work remotely
Steven Heidel Changed Heroku setting to Use_S3_Backend.
Fixed problem with acts_as_indexed by defaulting to tmp/index.
Commits on Jan 13, 2010
@parndt parndt make s3 backend setting work without putting it into environment.rb b…
…y putting it into the preinitializer.
Steven Heidel Changed model generator so that it is consistent with the changes to …
…the other models
Commits on Jan 14, 2010
@djones djones Building UI for themes 6825932
@djones djones Merge branch 'master' of into them…
Commits on Jan 15, 2010
@parndt parndt Fix truncate for Hpricot 0.8.2 and allow this to be used (or 0.8.1) 1ed1d13
Steven Heidel Added amazon_s3.yml and rackspace_cloudfiles.yml to the git ignore li…
…st, changed all config files to end with .example, updated refinery generator to customize all 3 config files.
Hernan Fernandez convert main menu functionality to jquery a700c71
Hernan Fernandez page dialogs to jquery 9cfb6d8
Hernan Fernandez fix jquery version from google load 8c3e733
Hernan Fernandez migrate page parts, fix dialogs 0dffca5
Hernan Fernandez migrate image dialog 04bfb73
Hernan Fernandez add default flash fade 8dc3b04
Hernan Fernandez migrate part of sortable page 9d00891
Hernan Fernandez replace image picker on page custom title bca6ea6
Hernan Fernandez fix per_page image count e596b07
@parndt parndt updated jQuery version and migrated some more admin functionality to …
@parndt parndt use hernan's shortcut for jQuery 64c3a84
@parndt parndt move .noConflict to the admin _head.html.erb and include tooltips aga…
…in and fix path to admin javascript
@parndt parndt get rid of more errors and introduce jqueryui to google load 3574daf
@parndt parndt this can actually be a rails tag 2789c5a
Commits on Jan 16, 2010
@djones djones front end nearly done for themes 4299e1f
Commits on Jan 17, 2010
@parndt parndt Explicitly call all of the scriptaculous dependencies when using cach…
…ing because rails ignores them otherwise. Fixes issue #32
@parndt parndt no more tooltips until we get a jQuery solution, preferably one that …
…uses jQuery UI.
Commits on Jan 19, 2010
@djones djones better theme UI. Now shows preview image, allows you to select the th…
…eme you want to apply right now and also checks to make sure the theme directory is writable for Heroku. If it's not then disable adding and editing themes.
@parndt parndt ensure that the content page doesn't display the submenu if the page …
…is being displayed in an admin layout e.g. 404
Commits on Jan 20, 2010
@djones djones added documentation for theme 6ea0746
@djones djones added documentation for themes e7d6e39
@djones djones Merge branch 'master' of into them…
@djones djones permissions change on demolicious d6d1d3f
@parndt parndt add the zip gem back in. 06a3254
@djones djones trying to make yardoc play nice 83359ac
@djones djones hmm that breaks it e0c3494
@parndt parndt unfortunate d512c45
@parndt parndt Make themes support play nice with rake and the boot process and chan…
…ge theme_directory_is_writable to a class method as it doesn't really require an instance to work.
@parndt parndt remove some old assets 57b01e4
@parndt parndt remove some more unused assets 9a2698b
@parndt parndt Thanks, Maarten. 8628bdb
@parndt parndt Merge branch 'jQuery' of into jQuery
Commits on Jan 21, 2010
@djones djones Fixing up rdoc support c00db5b
@djones djones remove old generated doc files. also ignore yardoc ea3a9aa
@djones djones Ported the hemingway theme from Wordpress to Refinery 52f4743
@djones djones dont need these files in the theme e54cdd3
Commits on Jan 22, 2010
@parndt parndt ensure that rake tasks are only fetched into the project one time (th…
…ere were cases where tasks were running more than once when using the gem)
@djones djones ignore generated docs and attempt to make yardoc work this time now I…
… have the .yardopts file in place
@djones djones yardopt file is now easier to read what to document dedc59f
@parndt parndt Bugfixes around the dialogs and the save and continue functionality. …
…Removed libraries that won't be useful anymore. Things aren't perfect yet.
Commits on Jan 23, 2010
@djones djones Added link to developer documentation ad62207
Commits on Jan 24, 2010
@djones djones better subdomain setup for API docs f87f50a
@djones djones fixed up yardocs options (thanks to Loren Segal) 259ac80
@djones djones a bit tidier with the yardopts file 84e0ad4
Commits on Jan 25, 2010
Steven Heidel Fixed problem in rakefile when running from a plugin e6cf54e
@parndt parndt fix for README.rdoc and update version 6d9d551
@parndt parndt Add more information to routing file to say where engine routes are l…
Commits on Jan 26, 2010
@djones djones add documentation about how to extend Refinery with plugins b45632f
@djones djones Merge branch 'master' of 1a19da4
@djones djones adding empty help file for crud 38c9678
@djones djones converting our docs to fully use rdoc and it's formatting 3ffe8e3
@djones djones fix javascript support in themes c99151a
@djones djones Fixed themes so that you can use subdirectors inside your images, jav…
…ascripts and stylesheets directory (thanks csessions)
Commits on Jan 27, 2010
@djones djones added forgot my password support, removed unused code generated by re…
…stful authentication and tidied up what is left
@djones djones dont need this table 3ac7a12
@parndt parndt gem friendly full_filename 84fd4b3
@djones djones Added documentation about how Crudify works addeaae
@djones djones small doc improvement ddbe8d2
@parndt parndt be more helpful to our lovely users and contributors :) 9e6f213
@djones djones show everyone they need Rmagick as a requirement and also disable sil…
…m scoorge for Windows users because it contains c extensions
@parndt parndt turned the bundled themes into zip files which are installed automati…
…cally when rake db:setup is run when the application is originally installed (or they can be manually uploaded if upgrading to this version).
@parndt parndt fixed references to the rdoc files and now we're upgrading the refine…
…ry preinitializer on a refinery-update-core too.
@djones djones helping out our Heroku users with a bit of documentation 32f2397
@djones djones show everyone they need Rmagick as a requirement and also disable sil…
…m scoorge for Windows users because it contains c extensions
@djones djones helping out our Heroku users with a bit of documentation 8f77642
@djones djones Merge branch 'master' of ffd78fa
@djones djones better readme that tries to answer the question of Why Refinery? 9769d53
@djones djones outline what Refinery comes with and mention how to extend it a40274e
@djones djones ops gotta remember this is not markdown 59b415f
@djones djones link everyone to the demo of course 117d7e6
@djones djones trailing slash not needed bd601e7
@djones djones trailing slash not needed 1dec35f
@djones djones documenting each plugin within Refinery fb42387
@avit avit Use presenter object for templates
The @page object is used in layouts to render various page parts such as
the title, meta tags, etc. A presenter object stands in for when this
isn't an instance of Page, so that it answers to the same methods
required by the template.

To present any generic model, just call present(@model) in your controller.

You can create custom presenters for your own models by inheriting from
@avit avit Cleanup: method not needed in generator template, and whitespace acf1d31
@djones djones Finishes off documentation 2ac9d96
@djones djones fix links ff02307
Commits on Jan 28, 2010
@djones djones Much better documentation formatting with markdown 181a1e1
@djones djones improving readme file e9ca9ba
@djones djones more refinements to the readme file 923f9f3
@djones djones major documentation review. changed format to markdown to support scr…
…eenshots and better formatting
@djones djones link to each of the docs from the main doc e984b72
@parndt parndt overhauled a bit of the core to provide the functionality for present…
…ers that were submitted by avit (thanks) which gives the ability to use a different model than Page for the meta information such as browser title. Added a public/javascripts/admin.js file which allows the developer to hook into wymeditor for example and is included just after the js frameworks but just before the js libraries. Updated themes to use new architecture. ApplicationHelper::setup is now deprecated and tells you so in your log file.
@parndt parndt merge 6c69e92
@djones djones ops fix up a bit where i missed the rdoc to markdown conversion 9b40d1b
@djones djones removed docs about the dashboard in the image docs 1d480b1
Commits on Jan 29, 2010
@parndt parndt migrated some more code over to jQuery but still more to go 8e32dd0
Commits on Jan 31, 2010
@djones djones improved readme 983d44f
@djones djones Improved documentation, especially around authentication and settings c52052d
@djones djones ops fix markdown syntax 8158c8d
@djones djones ops fix markdown syntax 975e0b3
@djones djones slim scrooge is not required for Windows and JRuby users 1a0301f
@djones djones italics instead of bold f6dab92
@djones djones add inline documentation into the page model and move any magic numbe…
…rs or strings out to constants
@djones djones adding the basic folders for tests d878c0c
Commits on Feb 01, 2010
@djones djones added page unit tests and basic fixtures to test deletability, and pa…
…ge paths
@parndt parndt use the theme.folder_title (renamed from theme.theme_folder_title due…
… to redundancy in method name) when switching theme and add a title to the activate theme button (Fixes GH Issue #33)
@parndt parndt Merge branch 'master' of 0bc0b9d
@djones djones 99% done with unit tests for page model. 3 tests failing right now cb5212a
@parndt parndt remove now useless libraries, update jquery version. a9a151d
@parndt parndt moved some more code to jQuery. Getting reordering working, still a w…
…ork in progress, this code is not stable.
@parndt parndt Changed to $ as prototype and scriptaculous are now gone. Reordering …
…appears to work now but limited functionality (new lists can't be created under other lists and it's jumpy with the CSS).
@djones djones fixed links in docs dd9ce4c
@djones djones add in themes and plugins as stuff included with Refinery eb1546e
@parndt parndt reorder finishes on click of the done button now b103396
@parndt parndt fix dialogs for resources and images and make reordering work only sl…
…ightly better
Commits on Feb 02, 2010
@parndt parndt Made :method => :delete into a class that hooks into some unobtrusive…
… javascript to open the confirm dialogue and submit the destroy request. Reduces the amount of HTML in the backend.
@parndt parndt Don't need the files for this 95a9883
@djones djones remove the relationship between pages and images. Now we have page pa…
…rts you use that mechanism to display custom content like images. We don't need to rely on pages having a direct link with images anymore.
@djones djones Added tests for page parts bc2d391
@djones djones Adding image tests and documenting each method on the image model inline 9bb0452
@parndt parndt make more stable, still testing to come 8893fb7
@parndt parndt Apply CSS class now works as with prototype 10d3dbe
@parndt parndt mark a CSS class from the dropdown when that class is selected on the…
… container that is being applied to
@parndt parndt ensure class names remain when the tag changes a3ec77a
@parndt parndt ensure style and class attributes are copied to links that replace ot…
…her links
Commits on Feb 03, 2010
@parndt parndt document IE paste feature and give image form friendlier errors 1a87376
@parndt parndt Wee fix for IE b337c66
@parndt parndt make the header display consistently across browsers 67cc973
@rubylibre rubylibre ignore theme directory 135c1a9
@rubylibre rubylibre major improvent of the flash message (flash shows and will not be ava…
…ilable next action.. like forgot password)
Luke Brown Added another test to prove the child page is still shown when set to…
… hidden
Luke Brown Changed the ruby operator as *and* has a lower precedence resulting in
is_in_menu being set to the return of not the whole line as expected
@djones djones Thanks to these new contributors 680e240
@parndt parndt Switch to using jQuery draggable 5482c60
@parndt parndt ensure header is consistent on the login screen too 0d14279
@parndt parndt implement some code for safari from the release candidate version of …
…wymeditor that does setFocusToNode properly. Fixed whitespace on this file which was strangely incorrect.
@parndt parndt Merge in jQuery branch 60c1005
@djones djones now running on jQuery, good by prototype c4006ef
@djones djones test was right, I was wrong so test passes now c2a8c9e
Commits on Feb 04, 2010
@parndt parndt add in possiblity to hack the development environment when you get th…
…e A copy of XX has been removed from the module tree but is still active error
@parndt parndt Merge branch 'master' of 6771dcd
@parndt parndt modified page parts so that they use the actual title that the user s…
…upplied as their title and then we transform it into something dom usable afterward. This makes the tests pass. Supplied migration to change existing page parts to the new format. So either page[:side_body] will work as well as page['SiDE BoDy'] or page['Side Body'] - case is not important neither are spaces vs underscores.
@djones djones use built in attachment_fu validation. removed old last_page method f…
…rom Image. Skeleton unit tests.
@djones djones Merge branch 'master' of 13ac918
@parndt parndt reordering works differently, now you select the parent page when edi…
…ting a page and limited reordering is supported. Also some dialogues are now using jquery UI not thickbox. We'll move completely away from thickbox soon.
@parndt parndt Merge branch 'master' of abcc84b
@parndt parndt we're now at version 0.9.6 (much fanfare) 9575c6a
@parndt parndt this may as well say the new version 88c423b
@parndt parndt don't copy the themes in on a gem install, these can be installed fro…
…m the gem itself.