diff --git a/.bundle/config b/.bundle/config deleted file mode 100644 index 6b54ec9f3f..0000000000 --- a/.bundle/config +++ /dev/null @@ -1,2 +0,0 @@ ---- -BUNDLE_WITHOUT: adapters diff --git a/.gitignore b/.gitignore index d552748287..0f2c82fccf 100644 --- a/.gitignore +++ b/.gitignore @@ -21,3 +21,5 @@ tmp/* nbproject public/cache/* .rbenv-version +bin/ +.bundle/ diff --git a/CHANGELOG b/CHANGELOG index 0f5bf82fc2..5db55c6120 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,114 +1,909 @@ -commit 07cd1095848e66d7c847eebbe244890c6ce0e92d -Author: Frédéric de Villamil + French translation of redirections related sentences + +commit 156b63b6dbdbfd2fdcdbdb748fbdea6e453cd217 +Author: Matijs van Zuijlen - Fixes live search. I'll have to check why we didn't find that one before + Create a second migration to fix article post types. -commit 48468deb27cecbf5dd50c1a520bb45b443f26691 -Author: Frédéric de Villamil +commit 1422de9e554d57f5c85cc81c74b892208a73a8e2 +Author: Yannick Francois - Fixes a bug when displaying a protected article within a category + Fix specs -commit 69ca931d642a4d3db9eae2d1556874df532b8407 -Author: Frédéric de Villamil +commit 4779a1fb698eb9a02dec9ce0c71267d5542f22b2 +Author: Frédéric de Villamil + + Yo dawg, I heard you like typos so I put an epic typo in your typo so you can typo while you typo - Fixing issue 42: user creation not working. +commit a44b1ebc0112d5ed349696d3345edc80e88b0f2e +Author: Yannick Francois + + spec cleaning + +commit a95a4cb2ad093b91ba862f2b1119e7246c49dc18 +Author: Yannick Francois -commit 717dd9d888b3928154d55d7b4f690ebad5ab0100 + Move .rspec file to rspec.sample, because, each dev would build is own + dev env :-) + +commit 6fd964a65b284411ab0a3a32ac1ff2f4f6538ecd Author: Yannick Francois - remove unused files amd directory in test dir + some refactoring around comment controller -commit b07892e5a728e0e4179da301496e47474b551211 +commit 0ed86c55b1440c0512d4114d9ddfc5c068134bb1 Author: Yannick Francois - remove test dir + some refactoring to remove unuse code -commit 163e574de1408d5f1fbc66f60ce509b7946c0ec4 -Author: Huy Dinh +commit 3cafb1177cee92a2d24380d6dc6663f11f4100e3 +Author: Frédéric de Villamil - Fixing an obvious "blunder". + Update cKEditor -commit 8f2f4ecb0d612f4d3b5dd042797cb48420f51b11 -Author: Huy Dinh +commit d789da4188c1858a8808bc8193a663435aaea2d3 +Author: Frédéric de Villamil - Follow up, missed fixing another example. + Update cKEditor second take -commit 5c0c8bd07502b5c3a507f785a47383b8fc44d874 +commit 34ec3fbd0a778402bc57133337b24d23ee90ab50 +Author: Frédéric de Villamil + + Upgrade ckeditor third step + +commit d41bfcc695882ce6a85c418fcc5ef9775398a370 +Author: Frédéric de Villamil + + Upgrade ckeditor last step + +commit 76c9b3ca57028582b4ed7542645121159dd2791a +Author: Yannick Francois + + clean around text_filter (spec) + +commit 815240069a3cfddd861be6672da4d0353770e6e9 +Author: Yannick Francois + + add scope to resource and use them when it's possible + +commit 67c908215dfe6c6182ff8f24d94da0ad1df249e4 +Author: Yannick Francois + + add more scope on resource, (combine one) and use them + +commit 53f7cb0086f4207d5fdfad38853a9eab6d710f74 +Author: Frédéric de Villamil + + Fixes switching back and fort between simple and visual editor. + +commit 09c0cf266769c3aae24653f7d4a375583188c69d +Merge: 53f7cb0 67c9082 +Author: Frédéric de Villamil + + Merge branch 'master' of github.com:fdv/typo + +commit e6cc3068912d85dc7006718b1dd216c898783191 +Merge: e4aa089 09c0cf2 Author: Thomas Lecavelier - First, the simple link for non-js admin (UJS) + Merge branch 'master' into merge_tags + +commit 558c4e4ea09ede816bf529b13fcd75604c9691b9 +Author: Thomas Lecavelier + + TopLayer in admin is now a full page overlay (reduce miss-click risk). Clicking on it close the overlay. Better CSS (background transparancy) + +commit 816aa211eae6e3f44e8f05dc4246da2e217f9963 +Author: Matijs van Zuijlen + + Add encoding comments to spec files to satisfy Ruby 1.9. + +commit 4e275ecb7288e53e4be0afe133dd793890e0a394 +Author: Matijs van Zuijlen + + Backport fix for rspec issue 258. + +commit 618fd2f4e9adb9681052e098b1565dc9f4134082 +Author: Matijs van Zuijlen + + Make String#to_title deal with contents where body is nil. + +commit cb15f079cd3f64f276a889e7f538c6347238d210 +Author: Matijs van Zuijlen + + Pass article to partial when password checks out. + +commit f21ebfbc5e76b7a1917544cddff3dd4c5079abaf +Author: Matijs van Zuijlen + + Fix article routing spec: get method no longer works. + +commit 575a9e53354cd10357ba7bfe58716cd21479bb21 +Author: Matijs van Zuijlen + + Remove unused stub that fails on currently used RSpec. + +commit 386b6822928dde424a262a46cde972a399530799 +Author: Matijs van Zuijlen + + Revert "spec cleaning" -commit 260e760f50f4dafcf1598a73e664ad3f73f84f60 -Merge: b07892e 8f2f4ec +commit c174cf4a79f8c3c67ec7c1675aff31ad02db448a Author: Matijs van Zuijlen - Merge pull request #43 from Skudo/hotfix + Fix factory_girl deprecation warning. -commit 0423a97bd490b1eea600bc4dc7b42d61697934e3 -Author: Huy Dinh +commit daec85a096d9073b557b3402d780ee0a17b28ae0 +Author: Michael Reinsch - Fixing issue with RedCloth 4.2.7 (see comments in http://blog.typosphere.org/release-of-typo-6-0-6-a-major-one.html). + use named scope for selecting published articles -commit dee03029faec5bf2611e4e67220d87d1b3ab720b +commit 7e0199b3b0246519387ae8ccd859749da8a21854 +Author: Michael Reinsch + + use published_at, not created_at to determine when comments shall be closed + +commit 901f8d6e72055dd42aff2105e39cb4e5e6cc96e1 +Merge: c174cf4 7e0199b +Author: Thomas Lecavelier + + Merge pull request #53 from mreinsch/master + +commit 487dfdc84d6adb8807c6c4733070a5fd835357aa Author: Yannick Francois - create a Satanizable module, remove duplication about clean accents (by move method in satanizable)... + FIX broken spec -commit 84ccca3fbaba63b0da6af6a1e8b9c935fd39eeb4 -Merge: 260e760 dee0302 +commit 39bd190f362585860705ace7a5bf5f0c55544163 Author: Yannick Francois - Merge branch 'remove_accents' + Move get_or_build article to Article model (from content_controller). I hope it's a better place... -commit 31027227254a252b8b1add4d9311a7ca495982a5 -Author: Huy Dinh +commit ce95a6a42c422dc530a998992fd158f8c72f2fb5 +Author: Yannick Francois - This fix addresses issue #39: Time.parse apparently hiccups when the timestamp string contains "GMT+0000 (UTC)". Worked around this using fdv's suggestion to use DateTime.strptime. + Add simple_editor? to user, and clean user_spec. -commit 28623a8d65d8eeecacd5c1daa11e348920ac9e10 +commit a0b9612ae5cd3e0afca8f582633a4b6e09450f50 Author: Yannick Francois - refactorimg spec to remove duplications (my new job here ? :-p) + Clean admin content_controller (use simple_editor? and fix insert_editor action) -commit 508cfd6e5d860f6512adb1881d0037f7d6622f2c -Merge: 28623a8 0423a97 -Author: Frédéric de Villamil +commit db9416a5dee0f31deb450699f85fefa4c491cfed +Author: Yannick Francois + + add test on insert_editor action on admin page_controller + +commit d9c29940b82e327608c48d2f34a61b1b0344e289 +Author: Frédéric de Villamil + + Making the dashboard a little bit clearer, and the info style a little less flashy + +commit a444cf9d339dc581a45c6cbc4510e4a60bbce558 +Author: Frédéric de Villamil + + Making the simple editor a little clearer + +commit 9d8cbd67a85a79befdb54c1b401cd50f5e3a9a06 +Author: Frédéric de Villamil + + Setting up things so we can soon (or later) add a second administration color stylesheet (or two, or three...). I have some nice ideas you can easily imagine for that one + +commit 80e2f77e926fec675da74a53241c0fa50a2a49b0 +Author: Frédéric de Villamil + + Adding bootstrap dependencies, switching layout and menu to bootstrap + +commit 6e80af523f61a32198360d61fd6799681a74bd57 +Author: Frédéric de Villamil + + Removing dependencies to Twitter bootstrap, html cleaning + +commit 160be12102f9c2c0538989f676c820bdd8ac1961 +Author: Yannick Francois + + add rbenv-version to gitignore + +commit f11eb915354149dec400f5ee764af039572d1e80 +Merge: 6e80af5 160be12 +Author: Frédéric de Villamil + + Merge branch 'master' of github.com:fdv/typo + +commit bf4814eaeadd53981cb135ac02110c4e88162dea +Author: Frédéric de Villamil + + Moves Dashboard to bootstrap - Merge pull request #44 from Skudo/fix/RedCloth +commit 8b2dbe76268bae61cd6609b80e4d81c78f5db9d7 +Author: Frédéric de Villamil + + Articles / content -commit cb22ad8c192ad1a509483b309361c35c8d0fa13c +commit 3d426f10ac8a4eb9336b6554085f5c3b0c93850e Author: Frédéric de Villamil - Upgrades to Rails 3.0.10. + Porting the comments view to Bootstrap -commit 6298fcef8ed8909fe4829071fe7df016eeb2a9ea -Merge: cb22ad8 3102722 +commit 733b325b799c64319fe2ddc519ff555335e5d245 Author: Matijs van Zuijlen - Merge pull request #45 from Skudo/fix/issue_39 + Correct specced admin theme configuration variable. -commit f56980f25db474d2ea9a6363dfc62a28d4c42615 -Author: Thomas Lecavelier +commit 31fc10deadc67a422a1821378c81abc802ac8620 +Author: Matijs van Zuijlen - Add Category creation on Content creation page (UJS way). Induced some refactorisation in Categories views and model + Remove needless #delete_all method calls. -commit b8c0ff329f35e537e2ea25b70127a07fb1a3c821 -Merge: f56980f 6298fce -Author: Thomas Lecavelier +commit 33875a993906fcb7c97c9458cad1169ae2182fe1 +Author: Matijs van Zuijlen + + Remove superfluous bits from Gemfile. + +commit bdda71a5917e162b2f9fd1328a091424d2a9635b +Merge: 3d426f1 33875a9 +Author: Frédéric de Villamil Merge branch 'master' of github.com:fdv/typo -commit ae1ae6f35aecb9fc24c3ea8800e37d13f5173a3c -Author: Thomas Lecavelier +commit 25664cbfbb369c768344e64c6b3bd70d75489057 +Author: Matijs van Zuijlen - Update todo: category creation in Content creation page: Ok, take Tag merging for me + Add back source line to Gemfile. -commit 4501658d08c9b2ee74f1c2a085193799742b2084 +commit 8fb9242649f55d580deedf430501ebd8394a8ee1 +Merge: bdda71a 25664cb Author: Frédéric de Villamil - Fixes a bug where attachment thumbnails would not be created at upload from the editor and API. + Merge branch 'master' of github.com:fdv/typo + +commit a3c5c962cd684e1339d373dedcdc0cdc08aadf05 +Author: Frédéric de Villamil + + Moving login form to Bootstrap -commit f587ab8a39c8a723d70ca78bbc8fdf0c177f21b3 +commit 038f7379eca68e1dd8608739d8b8a6cf5b8a4075 Author: Frédéric de Villamil - Fixing in Ruby 1.9.2 + Adding a quick and dirty fix to users won't have to ssh and run initial migration: if the fire triggers fails it's most probably because the database was not loaded, so we run the migration engine as a rescue. + +commit 50b4fdedc3146a442182661ae14dd5568c09a55d +Author: Frédéric de Villamil + + Migrating setup + +commit bebe22130204638e3e763a3299f18afda2b473e2 +Author: Frédéric de Villamil + + Migrating sign up + +commit a334e9194735ee0306e339bee48f1e3d2ed07864 +Author: Frédéric de Villamil + + I don't like controllers with empty indexes rendering errors + +commit 92b9be985ce55fbe8b4fff5ff923a800a26c2cb9 +Author: Frédéric de Villamil + + Fixes a bad encoding issue under 1.9.2 + +commit e389f5081175739fee93d7d16bcf5f171bb77199 +Author: Frédéric de Villamil + + Replacing old will_paginate with scope based Kaminari. + +commit 6492aa32699e5935e920d5aadcdd9676f2db2cf0 +Merge: 92b9be9 e389f50 +Author: Frédéric de Villamil + + Fixes merge conflict + +commit 014391950b88f3bb39173fdd22c0b136fb52521a +Author: Frédéric de Villamil + + Adds customizable 404 pages with optionnal messages in the admin. Next: 500 + +commit 1b47f72eff8e4f7324bb4adf157bcd24c0df2249 +Merge: 6492aa3 0143919 +Author: Frédéric de Villamil + + Merge branch 'master' into bootstrap + +commit 58f3dbe72ecc93106fddd583cf3af48ab605f0f6 +Author: Frédéric de Villamil + + Removing useless Javascript based category reorder interface. Categories will now be ordered by name, which looks like the most likely way to do it. This is a first step to sub categories as the order interface prevented from having them. + +commit 2bd809bf8651c858bf6a6e6bd295ce0125ea9849 +Merge: 1b47f72 58f3dbe +Author: Frédéric de Villamil + + Merge branch 'master' into bootstrap + +commit f7f5515f196d9403f24e68c5358c8fc4caa9fe2d +Author: Frédéric de Villamil + + Allows admin redirects to act like an URL shortener when posting an empty from. + +commit 94a56cef7d035c3f8d0748982ed425f472a26c88 +Merge: 2bd809b f7f5515 +Author: Frédéric de Villamil + + Merge branch 'master' into bootstrap + +commit 3512e92a210df6e2543e5d4006af22d903d916f7 +Author: Frédéric de Villamil + + Removes Ruby 1.8 specific tests + +commit 2715b5ad5a5adecdbf4787f7edb3f8a8eab70fcb +Merge: 94a56ce 3512e92 +Author: Frédéric de Villamil + + Merge branch 'master' into bootstrap + +commit 75a6137260b74156aaabc9dd0740fd4df19805cd +Author: Frédéric de Villamil + + Updates login, account creation and password recovery + +commit 33ba179b26f54c1b9f1905764f329f9669df792a +Author: Frédéric de Villamil + + Make the login form slightly better. Sometimes it's just a matter of connceting the dots. + +commit 2128ad4e3a5b25670d22396009e2e8b9528614aa +Author: Frédéric de Villamil + + Better omments display + +commit 1f9fe927c745e8c88511e770475f7dbf9d600c5b +Author: Frédéric de Villamil + + Moving pages to Bootstrap + +commit e514bf2353aa2214eb0e56f330cd01c44f9e4923 +Author: Frédéric de Villamil + + Resources listing to Bootstrap + +commit 8d652589ab38ad141eb0848c60036730f80ed8c0 +Author: Frédéric de Villamil + + Categories now + +commit 8d409b1abc4e27f136f03d8e117295cfaf30b62b +Author: Frédéric de Villamil + + Tags to bootstrap + +commit 959a0dd65d3c865ccb4cf6b22d98ddb6dcee60f8 +Author: Frédéric de Villamil + + Settings and users + +commit 9d8c05849b2f3590efc55b7235d90eb729622a38 +Author: Frédéric de Villamil + + New editor for articles + +commit 1c6d8dae3f98473540ca7454c10fd1e3626e4686 +Author: Frédéric de Villamil + + Adds new editor for pages + +commit 1d94c294eaf2b833c4e2429117a30f9755e18eaf +Author: Frédéric de Villamil + + Improving the editor a little bit. This definitely needs some cleaning and... to be refactored + +commit ba172af2df45c9e741ab0bcca3925c3387c479ad +Author: Frédéric de Villamil + + Update to the main editor. Kinda like the way it looks like now, but lots of cleaning still needed (plus a major headache generating bug found). + +commit ae0f789c0ffefb8db6d603503757faeed92c8f3d +Author: Frédéric de Villamil + + Updated my TODO + +commit 2013a32dddf8dc982032da20c05df286f8ff36ef +Author: Frédéric de Villamil + + Fixing the specs. Removing useless specs as we don't rely on tabs anymore. I, however, need to add some more checks there, but on another way + +commit 7353d89e1e8094d31942288dc543df7987c6796f +Author: Frédéric de Villamil + + Fixes a bug setting up a post as published everytime you edit it even for a draft + +commit 85785ac752e3dee0c5fb18eb5a8c547f0794a303 +Author: Frédéric de Villamil + + Fixes comment moderation when using Akismet + +commit 76f0e0769520b5fa3cdafdd555e03a094be498cc +Merge: 7353d89 85785ac +Author: Frédéric de Villamil + + Merge branch 'master' into bootstrap + +commit 2006bffbfb73e54782d77ac91b732c2f81f2ea1f +Author: Frédéric de Villamil + + Fixes categories views + +commit 7bd4ad30c702e3cafa475b0e13971afd6a506dbc +Author: Frédéric de Villamil + + Porting post types to Bootstrap + +commit 679345450ba451c58fe14430d5e73ba376d6b661 +Author: Frédéric de Villamil + + Removing legacy use of subtabs_for + +commit 86a50e46a1c5604f2c0b130e9d5b70d90a82b1c7 +Author: Frédéric de Villamil + + Fixing failing specs on post type controllers + +commit 5d4bdec10d4a15a279f16b90e86206b14f48adf5 +Author: Frédéric de Villamil + + This one fixes the way articles are displayed in the administration and repairs pagination. I need a way to test this, YAF? + +commit a5fbcdfd46a382669258f9d861b159b18ea7042b +Author: Frédéric de Villamil + + Updating TODO + +commit 54f82caf6e0883a1313cb13c159265df952ef16f +Author: Frédéric de Villamil + + I'm pretty sure someone will be able to tell me why we translated the spam states straight into the state machine, because I f%$#g don't see the point. Plus it breaks all the filterings and display admin side. + +commit a59ae1e6ebffce6adf9c5d1ac730ec846ab0ee9b +Author: Frédéric de Villamil + + Adding per state filtering on articles listing + better display for drafts. + - default: everything but draft. + - published articles + - drafts + - publication pending + - withdrawn + +commit 8bfc7ed75b0df72d7aec2249c2f9528c617ec23f +Author: Frédéric de Villamil + + Drafts should be displayed like every other article + +commit 57fd4f07e076c8debb4fb845912625dc62270d85 +Author: Frédéric de Villamil + + Drafts should be displayed like every other article + +commit e87d50e0a16ecafe14bcecade6bdc5c604530bb5 +Author: Frédéric de Villamil + + One should run spec before commiting + +commit 1324f8d66a2acd07d3cd26511f4a9e8bf476e253 +Author: Frédéric de Villamil + + Fixing the way permalinks generation work. + +commit 0fe87923402fad205ffa7ff71990bde5d2271c5d +Author: Frédéric de Villamil + + Fixes the way autosave displays buttons: + - destroy this draft should only appear at autosave and when editing a draft + - destroy this article should only appear when article is not a draft + +commit c53eeeca3fb0b07d80328617d7da301eb24d4dd8 +Author: Frédéric de Villamil + + Updating SEO views + +commit 6dfb0e4aeb24ff6e2615750fa639fdf1d30a27fa +Author: Frédéric de Villamil + + Cleaning some code, removing some unshared partials. + +commit 4aac6bba0a7d13e316a1f85b18c60d97e66c51a1 +Author: Frédéric de Villamil + + Doing some cleaning in the detroy process: + – We don't need multiple destroy files when they all share the same code, excepted a message which can be defined from the controller name. + – An old chinese master once told me "the earlier you return, the better it is", so I reverted the conditions in the destroy methods, which seems much more sensible now that I think about it. + +commit 28c1ce20acab6c87b9d2a1553fd4fe677b7e34b9 +Author: Frédéric de Villamil + + Makes the redirects management work like categories and tags. + +commit 48922b2b1a39ef2702801d71f34b34749256ad7f +Author: Frédéric de Villamil + + I may have forgoten to add some files in my last commit. + +commit 25149602241184d3b80d5e537cf54d68e509818c +Author: Matijs van Zuijlen + + Use simplecov instead of rcov with Ruby 1.9. + +commit e24c3e5ac0d579d0048b85964802f836acf45b25 +Author: Matijs van Zuijlen + + Make specs pass. + +commit 2e441914a873e5e4a83de3cd47977fbd55d9c756 +Author: Frédéric de Villamil + + We said we would not support 1.8 anymore + +commit f85c206d77dab9ad4da1c3dbd8bea44cf3f48a84 +Author: Frédéric de Villamil + + Fixes the way we generate permalinks. + +commit 67a98ff39aa946e769e390078dfc031dd842e3d8 +Author: Matijs van Zuijlen + + Avoid confusion between @feedback and @record. + +commit 98ed36be1f691a047c074f99f6aed7bc488c3b4f +Author: Matijs van Zuijlen + + Allow newer versions of RedCloth. + +commit d439191413dcc403883a753ae317f93c2ce3b223 +Author: Matijs van Zuijlen + + Cause bundler to fail when database.yml does not exist. + +commit 7dd2503b932ff2e7c51f570be38645266e8b9e53 +Author: Frédéric de Villamil + + Fixes display on account creation and login + +commit 28c9364190f27e6cdcea07cf1d8baf758db4b6ba +Author: Frédéric de Villamil + + Moving theme selector to Bootstrap + +commit 3f66fa3775b9127d9a430a947c0765b9bf45613b +Author: Frédéric de Villamil + + Adding sample database.yml for every supported engine + +commit cd31dbca13ac2e6eb154a10b040c5b679c518b3b +Author: Frédéric de Villamil + + Updating sidebar interface + +commit 379458c7e0787b18763511807f83333ce31ef7cc +Author: Frédéric de Villamil + + Removing dead code + +commit a3e71a1981ae6b9bfcf65b5cebe08c31f90aafa6 +Author: Frédéric de Villamil + + Database settings + +commit e2ac79c612bb1f372c284d7033bf783fd91d2f76 +Author: Frédéric de Villamil + + Adds the media back into the editor. + +commit 545f18c9a5a446c0401bdfac8b8d2fcf1ced126a +Author: Frédéric de Villamil + + Doing some cleaning in the CSS, they really deserved it. + +commit f332a2d9c95f06c0956555304876d78f4a03915d +Author: Frédéric de Villamil + + Adding Bootstrap as a new default theme. + +commit 2c2f5e38c14b36cdd594a96fd3374530439967df +Author: Frédéric de Villamil + + Sometimes you don't clean enough, sometimes you clean too much. In both cases it's a fail + +commit 9f3d3208d087384c883fbe52db8d80eea9ad7673 +Author: Frédéric de Villamil + + Updating theme and adding theme documentation + +commit 61dbe33327801cca6e0bde342e2d1dc1713bee02 +Author: Frédéric de Villamil + + Adds comment count to Bootstrap index + +commit b2b4a9f085aec99631eb70366f6c85657a939d7a +Author: Frédéric de Villamil + + Removing the theme editor, for now. It will probably come back under another form later. + +commit ece334017de9fae82649a8321cefe4cb50d34d7b +Author: Frédéric de Villamil + + Ugly fix to make the menu working. One more thing to fix and I can release + +commit 2a484a1caa91cc22051b6643823b6e8920ccf2c8 +Author: Frédéric de Villamil + + Fixes the user edition + +commit 82b7ac31e34b090ecfc422e17e570e91b70b024f +Author: Frédéric de Villamil + + Fixes indent + +commit 5253418d27a608ab8040dffdfb156f55b57cc061 +Author: Frédéric de Villamil + + Restyling dashboard + +commit 698a1ee2eb7e94c32de48889f056c6a094cd3592 +Author: Frédéric de Villamil + + Fixes comment listing style + +commit 1653c3470c1719a2d34145f5fb48cc5f5f26ac54 +Author: Frédéric de Villamil + + Hmm this should not be here + +commit b817335db1f1921b1c38bf4936ea24fab8dacc18 +Author: Frédéric de Villamil + + Fixes admin/comments edition style + +commit 004259923a91866f0c7c0e0ad2f484c3a7a2e07b +Author: Matijs van Zuijlen + + Remove unused extend ActiveSupport::Memoizable. + +commit bbfca4f7df86deda245d2b3bcc3420a1e7068fbf +Author: Matijs van Zuijlen + + In the normal case, the password form is not rendered. + +commit b69b91b429c5fa75b766d9466f6324db2164630c +Author: Matijs van Zuijlen + + Clean up User model. + +commit 202947f405fb7874b6957a0758db68e9a3d74fd1 +Author: Matijs van Zuijlen + + Activate SimpleCov. + +commit b5b0da2e85eff3cca43f2a079a1eb7906a6e1b8b +Merge: b817335 202947f +Author: Frédéric de Villamil + + Merge branch 'master' of github.com:fdv/typo + +commit cb44d16b47cc50f470ca1b246d88ea97e1949658 +Author: Matijs van Zuijlen + + Remove outdated comment. + +commit 1bccf13c52178ee5e7785c75cf09dc91234734fe +Author: Matijs van Zuijlen + + Disable thread safe Rails in production. + +commit fb740cf3c2c13b71d5c2c69596134ff851af985d +Merge: b5b0da2 1bccf13 +Author: Frédéric de Villamil + + Merge branch 'master' of github.com:fdv/typo + +commit c0e228d7a75970e67cce4597e593f8a1a347c74e +Author: Matijs van Zuijlen + + Clean up Content methods. + +commit d7f8b19644f87f5feb952ebd99f807b052b960a4 +Author: Matijs van Zuijlen + + Remove useless calls to #changed. + +commit 7211858531958703b48b2323400fc80ad41a4cfb +Author: Matijs van Zuijlen + + Remove some unused methods. + +commit f5d0883587b8f9c9849cf3a2e14ea85e607628f0 +Author: Matijs van Zuijlen + + Get behind me, Satan! + +commit a1fa1a41194d9939aeec24a10a06fae98f209978 +Author: Matijs van Zuijlen + + Use Sanitizable in the Article model. + +commit 5174867278bbffcd589c4dd190334d817c9d85e6 +Author: Matijs van Zuijlen + + Remove unused themes helper. + +commit b2b43bd8afdc88364a47ee60e636974ae8dbc6c9 +Merge: fb740cf a1fa1a4 +Author: Frédéric de Villamil + + Merge branch 'master' of github.com:fdv/typo + +commit 7551885b16783c257bf80a199a516d07167ba10d +Author: Matijs van Zuijlen + + Make settings writers work during #initialize. + +commit 3499c7ae0040a78ee55c8bcaab4240a834e86d44 +Author: Matijs van Zuijlen + + Avoid accidentally loading old drafts. + +commit d694c2a28c4e722294ef19862159a768f630a8c1 +Author: Matijs van Zuijlen + + Small refactoring. + +commit 6668930865b59b4379733176168e8fdc5d125cfd +Merge: b2b43bd d694c2a +Author: Frédéric de Villamil + + Merge branch 'master' of github.com:fdv/typo + +commit 52cce13a9adefc8b0a04bc0e71f3dafbc0d07d60 +Author: Frédéric de Villamil + + Fixes broken login and user creation. + +commit 476837135b9cb9da63351b5e9bdf4beb022bef03 +Author: Frédéric de Villamil + + Fixes post types display when there is no post type at all + +commit 43d1545ee9c2180eb21b0171473ad27eafe7f732 +Author: Frédéric de Villamil + + Moves redirects from settings to articles. Adds consistency to the menu + +commit 591eeb2e32a3c4e9ef5668b9d95b544177091512 +Author: Frédéric de Villamil + + No need to call layout "administration" in every controller as it is already called from the parent class and therefore inherits from it. + +commit 0abd858faa08dd03bcf47f87958b89a24ab030cb +Author: Frédéric de Villamil + + Adds some style to autocomplete + +commit 82c73cd62c3fc616cb44660d9ac6b4dfbe53ddb9 +Author: Frédéric de Villamil + + Removing theme catalogue and mentions of Typogarden. + +commit 0dea7594acd3aa6c107e84ba4ea0d82a2ae1c624 +Author: Frédéric de Villamil + + Removing theme catalogue from access rules + +commit 4f94fd88d28be2d5cafc1200d31a48d3c12605c0 +Author: Frédéric de Villamil + + Fixes a bug in the dashboard + +commit 9f5180e903db4a9923e13241597a0d6f171d702f +Author: Maarten Mulders + + Translations and one grammar correction + +commit 83d97d0db9c7f17e600db4d8f154a0d5431f4eb4 +Merge: 4f94fd8 9f5180e +Author: Matijs van Zuijlen + + Merge pull request #61 from mthmulders/master + +commit 3f9753c63aa9b6228f9af28a48b7fec66140bd9e +Author: Diego Elio Pettenò + + Make sure that migration 103 does not destroy tag association. + +commit 5ae108a4b3077a24e956daf818655d10b4e49b72 +Author: Frédéric de Villamil + + Fixes issue 55: ActionView::Template::Error (settings was supposed to be a Hash, but was a String) + +commit 63843aa9b75b7677aebfc125e1ad44873ede3356 +Author: Frédéric de Villamil + + Fixes specs for tags autocomplete + +commit 93f4196ff29f45a65a7571906f51077a22580376 +Author: Maarten Mulders + + Some more Dutch translations + +commit 7e4f07746f3eb63910da558746aa250582bfc5ab +Merge: 63843aa 93f4196 +Author: Matijs van Zuijlen + + Merge pull request #64 from mthmulders/master + +commit 4c59f992238bfb7df820dda12da4d7a000ee69ea +Author: Frédéric de Villamil + + Moves permalink sanitization to String with a new to_permalink method. + +commit 7db1582a2e1802fc8d264cfaf074d80a00aed2ad +Author: Frédéric de Villamil + + Force categories to use to_permalink + +commit aae592454fbc95e129aa3ca88eb3f3eb0b48a3ee +Author: Frédéric de Villamil + + Fixing specs for pages. Moving permalink related specs to model which is where they should be + +commit cd2e895be9f312c8830dc33620176c59e15d4795 +Author: Frédéric de Villamil + + Moves the permalink generation to model + +commit 564c0a6740851ec221b9eec669f6c8a08464d01b +Author: Frédéric de Villamil + + Adds permalink field to category creation + +commit 5d2c6dcbe5b14cf52c37b6b6176e0932b737f355 +Author: Frédéric de Villamil + + Fixes permalink not being correctly updated when updating a permalink. closes #62 + +commit 75c407378096bfc211d33349145f2a08562738ec +Author: Frédéric de Villamil + + Fixes the comment management bulk operations. Closes #46 + +commit 3139b2d757c8967b051f413d962e40e0a4052ca2 +Author: Frédéric de Villamil + + Makes article controller specs pass + +commit 3f8e52023821cc45268015a98d9f674606c98b52 +Author: Frédéric de Villamil + + Cleans access rules file, adds some more submenu for clarity + +commit a1dd7990c9661db5e9ba6da1438803bb2a6c659b +Author: Frédéric de Villamil + + Changes the CKEditor theme + +commit a1e70bb5837ad831576c170a59b93a6dd776c5c4 +Author: Frédéric de Villamil + + Makes the redirect links clickable (much better heh) + +commit 9272674bbfe83f7ade32dd56a78c496af774b5ca +Author: Frédéric de Villamil + + Fixes CKEditor file upload + +commit abb2dcc5017dc6ba81332cb144972228302a05ea +Author: Frédéric de Villamil + + Smells like 6.0.10 + +commit f768f674b88afe0fc6eb65469b60ec0b65b15e63 +Author: Frédéric de Villamil + + Release of Typo 6.1.0 diff --git a/Gemfile b/Gemfile index ac4ef6e150..bfe31a3af3 100644 --- a/Gemfile +++ b/Gemfile @@ -25,29 +25,29 @@ end source :rubygems -gem 'rails', '3.0.10' +gem 'rails', '~> 3.0.10' gem 'require_relative' gem 'htmlentities' gem 'json' -gem 'bluecloth', '>= 2.0.5' +gem 'bluecloth', '~> 2.1' gem 'coderay', '~> 0.9' gem 'kaminari' gem 'RedCloth', '~> 4.2.8' -gem 'addressable', '~> 2.1.0', :require => 'addressable/uri' -gem 'mini_magick', '1.3.3', :require => 'mini_magick' -gem 'uuidtools', '~>2.1.1' +gem 'addressable', '~> 2.1', :require => 'addressable/uri' +gem 'mini_magick', '~> 1.3.3', :require => 'mini_magick' +gem 'uuidtools', '~> 2.1.1' gem 'flickraw-cached' gem 'rubypants', '~> 0.2.0' -gem 'rake', '>= 0.9.2' +gem 'rake', '~> 0.9.2' gem 'acts_as_list' gem 'acts_as_tree_rails3' gem 'recaptcha', :require => 'recaptcha/rails', :branch => 'rails3' group :development, :test do gem 'ruby-debug19' - gem 'factory_girl', '2.2.0' + gem 'factory_girl', '~> 2.2' gem 'webrat' - gem 'rspec-rails', '>= 2.0.0.beta.20' + gem 'rspec-rails', '~> 2.0' gem 'simplecov', :require => false gem 'sqlite3' end diff --git a/README.textile b/README.textile index 59a32ffd85..0f3d46eabb 100644 --- a/README.textile +++ b/README.textile @@ -1,102 +1,100 @@ h1. About Typo -Typo has been around since March of 2005 making it one of the oldest blogging platforms in Rails. With powerful SEO capabilities, full themes, and plug-ins, this platform has all the features needed for a great user experience for both web developers and site visitors. Typo is available as a gem or source tarball. +Typo has been around since March of 2005 making it one of the oldest blogging platforms in Rails. -The current version is Typo 6.0.9 for Ruby on Rails 3.0.10 +It provides every feature a modern blogging engine needs: powerful themes, extensions, smart users management, SEO capabilities and brings a great user experience for both site visitors and Web developpers. Typo is easy to install and even easier to use. + +Typo is free software released under the MIT licence and maintained by a bunch of cool people on their spare time. + +The current version is Typo 6.1.0 for Ruby on Rails 3.0.10. !http://blog.typosphere.org/download-typo.png(Download Typo)!:http://typosphere.org/stable.tgz +h1. Useful links + h2. Enhance your Typo blog -* "Themes Catalogue":http://typogarden.org/ * "Sidebar Plugins":https://github.com/fdv/typo/wiki/Sidebar-plugins * "In page Plugins":https://github.com/fdv/typo/wiki/In-Page-Plugins -h2. Useful Links: +h2. More resources: * "Download Typo source code:":http://typosphere.org/stable.tgz * "*Report a bug*":https://github.com/fdv/typo/issues * "*Frequently Asked Questions*":http://wiki.github.com/fdv/typo/frequently-asked-questions * "Official Typo blog":http://blog.typosphere.org -* "Follow us on Twitter":httpL//twitter.com/typosphere +* "Follow us on Twitter":http://twitter.com/typosphere + +h2. Get in touch -h2. Get some help +If you need help or want to contribute to Typo, you should start with the following: * IRC: #typo on irc.freenode.net * "Mailing list":http://rubyforge.org/mailman/listinfo/typo-list -h2. Maintainers -This is a list of Typo maintainers. If you have committed, please add your name and contact details to the list. - -h3. The Cool Kids - -*Frédéric de Villamil* -blog: http://t37.net -irc: neuro` - -*Matijs van Zuijlen* -blog: http://www.matijs.net/blog/ -irc: matijs - -*Thomas Lecavelier* -blog: http://blog.ookook.fr/ -irc: ook - -*Yannick François* -blog: http://elsif.fr -irc: yaf - -*Cyril Mougel* -blog: http://blog.shingara.fr -irc: shingara - -h3. Original Author - -Tobias Luetke -blog: http://blog.leetsoft.com/ -irc: xal - +h1. Install Typo -h1. Installing Typo - -There are various way of installing Typo, but the easiest way is the install using the gem. +Installing Typo is trivial, provided you follow the following steps. h2. 1. Prerequisites To install Typo you need the following: -* Ruby 1.8.7 or Ruby Enterprise Edition or Ruby 1.9.2. +* Ruby 1.9.2 or 1.9.3. Typo may work with Ruby 1.8.7 with some minor tweakings, but this version is not supported anymore. * Ruby On Rails 3.0.10 * A database engine, MySQL, PgSQL or SQLite3 -* The Ruby connector to your favorite database engine * A FTP client or even better SSH access to your hosting provider -h2. 2. Get Typo +h2. 2. Download Typo Download Typo stable version at http://typosphere.org/stable.tar.gz or http://typosphere.org/stable.zip. h2. 3. Install Typo -Unpack Typo archive into your Web hosting space. - -Rename database.yml.example to database.yml and fill in your database credentials for production mode. +Unpack Typo archive into your Web hosting space. Rename database.yml.yourEngine to database.yml, edit the file and add your database name, login and password. If you have a doubt about this one, just ask your Web hosting provider. Then run: $ bundle install -$ rake RAILS_ENV=production db:migrate +$ ./script/rails server -h2. 4. Start/Stop Typo +You can now access Typo to http://yourdomain:3000 -To use / test typo, run: +That's all! -./script/rails server - -h1. Daily use +h2. 4. Daily Typo use We recommend using Passenger (mod_rails) or Thin / Unicorn with Apache or Nginx. -The admin interface for Typo allows you to post articles and change configuration settings. It can be found at http://yourdomain.com/admin. New content can be posting using the admin interface or a desktop blog editor such as MarsEdit or Ecto. For a list of working clients, please visit http://typosphere.org/wiki/DesktopClients +The admin interface for Typo allows you to post articles and change configuration settings. It can be found at http://yourdomain.com/admin. New content can be posted using the admin interface or a desktop blog editor such as MarsEdit or Ecto. For a list of working clients, please visit http://typosphere.org/wiki/DesktopClients. + +h1. Maintainers + +This is a list of Typo maintainers. If you have committed, please add your name and contact details to the list. + +h2. The Cool Kids + +*Frédéric de Villamil* +blog: http://t37.net +irc: neuro` + +*Matijs van Zuijlen* +blog: http://www.matijs.net/blog/ +irc: matijs + +*Thomas Lecavelier* +blog: http://blog.ookook.fr/ +irc: ook + +*Yannick François* +blog: http://elsif.fr +irc: yaf + +And many more cool people who've one day or another contributed to Typo. + +*Original Author: Tobias Luetke* +blog: http://blog.leetsoft.com/ +irc: xal Enjoy, The Typo team diff --git a/app/controllers/admin/content_controller.rb b/app/controllers/admin/content_controller.rb index 28e20d53a7..6ef4ebf969 100644 --- a/app/controllers/admin/content_controller.rb +++ b/app/controllers/admin/content_controller.rb @@ -92,7 +92,7 @@ def autosave @article.text_filter = current_user.text_filter if current_user.simple_editor? get_fresh_or_existing_draft_for_article - + @article.attributes = params[:article] @article.published = false set_article_author @@ -166,16 +166,11 @@ def new_or_edit set_article_author save_attachments - if @article.draft - @article.state = "draft" - else - @article.permalink = @article.stripped_title if @article.permalink.nil? or @article.permalink.empty? - end + @article.state = "draft" if @article.draft if @article.save destroy_the_draft unless @article.draft set_article_categories - set_shortened_url if @article.published set_the_flash redirect_to :action => 'index' return @@ -233,19 +228,6 @@ def set_article_categories end end - def set_shortened_url - # In a very short time, I'd like to have permalink modification generate a 301 redirect as well to - # So I set this up the big way now - - return unless Redirect.find_by_to_path(@article.permalink_url).nil? - - red = Redirect.new - red.from_path = red.shorten - red.to_path = @article.permalink_url - red.save - @article.redirects << red - end - def def_build_body if @article.body =~ // body = @article.body.split('') diff --git a/app/controllers/admin/pages_controller.rb b/app/controllers/admin/pages_controller.rb index 2345398058..8c95c8b68b 100644 --- a/app/controllers/admin/pages_controller.rb +++ b/app/controllers/admin/pages_controller.rb @@ -17,12 +17,8 @@ def new @page.text_filter ||= current_user.text_filter @images = Resource.where("mime LIKE '%image%'").order('created_at DESC').page(1).per(10) if request.post? - if @page.name.blank? - @page.name = @page.sanitized_title - end @page.published_at = Time.now if @page.save - set_shortened_url if @page.published flash[:notice] = _('Page was successfully created.') redirect_to :action => 'index' end @@ -35,7 +31,6 @@ def edit @page = Page.find(params[:id]) @page.attributes = params[:page] if request.post? and @page.save - set_shortened_url if @page.published flash[:notice] = _('Page was successfully updated.') redirect_to :action => 'index' end @@ -49,19 +44,6 @@ def destroy redirect_to :action => 'index' end - def set_shortened_url - # In a very short time, I'd like to have permalink modification generate a 301 redirect as well to - # So I set this up the big way now - - return unless Redirect.find_by_to_path(@page.permalink_url).nil? - - red = Redirect.new - red.from_path = red.shorten - red.to_path = @page.permalink_url - red.save - @page.redirects << red - end - # TODO Duplicate with Admin::ContentController def insert_editor editor = 'visual' diff --git a/app/controllers/admin/themes_controller.rb b/app/controllers/admin/themes_controller.rb index 9541a3324c..9fe926e6be 100644 --- a/app/controllers/admin/themes_controller.rb +++ b/app/controllers/admin/themes_controller.rb @@ -27,55 +27,9 @@ def switchto redirect_to :action => 'index' end - def catalogue - # Data get by this URI is a JSON formatted - # The return is a list. All element represent a item - # Each item is a hash with this key : - # * uid - # * download_uri - # * name - # * author - # * description - # * tags - # * screenshot_uri - url = "http://www.dev411.com/typo/themes_2-1.txt" - open(url) do |http| - @themes = parse_catalogue_by_json(http.read) - end - rescue => e - logger.info(e.message) - nil - - @themes = [] - @error = true - end - protected def zap_theme_caches FileUtils.rm_rf(%w{stylesheets javascript images}.collect{|v| page_cache_directory + "/#{v}/theme"}) end - - private - - class ThemeItem < Struct.new(:image, :name, :url, :author, :description) - def to_s; name; end - end - - def parse_catalogue_by_json(body) - items_json = JSON.parse(body) - items = [] - items_json.each do |elem| - next unless elem['download_uri'] # No display theme without download URI - item = ThemeItem.new - item.image = elem['screenshot_uri'] - item.url = elem['download_uri'] - item.name = elem['name'] - item.author = elem['author'] - item.description = elem['description'] - items << item - end - items - items.sort_by { |item| item.name } - end end diff --git a/app/models/article.rb b/app/models/article.rb index a933ba5d87..c80469b734 100644 --- a/app/models/article.rb +++ b/app/models/article.rb @@ -5,7 +5,6 @@ class Article < Content include TypoGuid include ConfigManager - include Sanitizable serialize :settings, Hash @@ -48,9 +47,8 @@ def spam before_create :set_defaults, :create_guid after_create :add_notifications - before_save :set_published_at, :ensure_settings_type - after_save :post_trigger - after_save :keywords_to_tags + before_save :set_published_at, :ensure_settings_type, :set_permalink + after_save :post_trigger, :keywords_to_tags, :shorten_url scope :category, lambda {|category_id| {:conditions => ['categorizations.category_id = ?', category_id], :include => 'categorizations'}} scope :drafts, lambda { { :conditions => { :state => 'draft' }, :order => 'created_at DESC' } } @@ -73,6 +71,11 @@ def initialize(*args) end end + def set_permalink + return if self.state == 'draft' + self.permalink = self.title.to_permalink if self.permalink.nil? or self.permalink.empty? + end + def has_child? Article.exists?({:parent_id => self.id}) end @@ -119,10 +122,6 @@ def search_with_pagination(search_hash, paginate_hash) end - def stripped_title - remove_accents(title).gsub(/<[^>]*>/, '').to_url - end - def year_url published_at.year.to_s end @@ -285,6 +284,7 @@ def self.get_or_build_article id = nil art.allow_comments = art.blog.default_allow_comments art.allow_pings = art.blog.default_allow_pings art.text_filter = art.blog.text_filter + art.old_permalink = art.permalink_url unless art.permalink.nil? or art.permalink.empty? art.published = true end end @@ -437,7 +437,7 @@ def set_defaults self.permalink.to_s =~ /article-draft/ or self.state == "draft" ) - self.permalink = self.stripped_title + set_permalink end if blog && self.allow_comments.nil? self.allow_comments = blog.default_allow_comments diff --git a/app/models/category.rb b/app/models/category.rb index 40f3470d74..4e1108a4cd 100644 --- a/app/models/category.rb +++ b/app/models/category.rb @@ -50,10 +50,6 @@ def self.reorder_alpha reorder send(:with_exclusive_scope){find(:all, :order => 'UPPER(name)').collect { |c| c.id }} end - def stripped_name - self.name.to_url - end - def published_articles articles.already_published end @@ -79,10 +75,10 @@ def to_param protected - before_save :set_defaults + before_save :set_permalink - def set_defaults - self.permalink ||= self.stripped_name + def set_permalink + self.permalink = self.name.to_permalink if self.permalink.nil? or self.permalink.empty? end validates_presence_of :name diff --git a/app/models/content.rb b/app/models/content.rb index 8aa5484f8d..1d6e646a46 100644 --- a/app/models/content.rb +++ b/app/models/content.rb @@ -69,6 +69,24 @@ def invalidates_cache?(on_destruction = false) (changed? && published?) || just_changed_published_status? end end + + def shorten_url + return unless self.published + + r = Redirect.new + r.from_path = r.shorten + r.to_path = self.permalink_url + + # This because updating self.redirects.first raises ActiveRecord::ReadOnlyRecord + unless (red = self.redirects.first).nil? + return if red.to_path == self.permalink_url + r.from_path = red.from_path + red.destroy + self.redirects.clear # not sure we need this one + end + + self.redirects << r + end class << self def content_fields *attribs @@ -262,7 +280,7 @@ def normalized_permalink_url def short_url # Double check because of crappy data in my own old database return unless self.published and self.redirects.count > 0 - blog.url_for(redirects.first.from_path, :only_path => false) + blog.url_for(redirects.last.from_path, :only_path => false) end end diff --git a/app/models/page.rb b/app/models/page.rb index 09eaf7da3e..dc5643e03a 100644 --- a/app/models/page.rb +++ b/app/models/page.rb @@ -1,14 +1,20 @@ class Page < Content belongs_to :user - validates_presence_of :name, :title, :body + validates_presence_of :title, :body validates_uniqueness_of :name include ConfigManager - include Sanitizable serialize :settings, Hash setting :password, :string, '' + before_save :set_permalink + after_save :shorten_url + + def set_permalink + self.name = self.title.to_permalink if self.name.blank? + end + def initialize(*args) super # Yes, this is weird - PDC @@ -30,7 +36,7 @@ def self.search_paginate(search_hash, paginate_hash) paginate_hash[:order] = 'title ASC' list_function << "page(paginate_hash[:page])" list_function << "per(paginate_hash[:per_page])" - + eval(list_function.join('.')) end @@ -47,8 +53,4 @@ def permalink_url(anchor=nil, only_path=false) def self.find_by_published_at super(:created_at) end - - def sanitized_title - remove_accents(self.title).gsub(/<[^>]*>/, '').to_url - end end diff --git a/app/models/post_type.rb b/app/models/post_type.rb index ea1968031d..0361edc77a 100644 --- a/app/models/post_type.rb +++ b/app/models/post_type.rb @@ -1,6 +1,5 @@ # coding: utf-8 class PostType < ActiveRecord::Base - include Sanitizable validates_uniqueness_of :name validates_presence_of :name validate :name_is_not_read @@ -11,7 +10,7 @@ def name_is_not_read end def sanitize_title - self.permalink = remove_accents(self.name).gsub(/<[^>]*>/, '').to_url + self.permalink = self.name.to_permalink end end diff --git a/app/models/sanitizable.rb b/app/models/sanitizable.rb deleted file mode 100644 index cebd34840f..0000000000 --- a/app/models/sanitizable.rb +++ /dev/null @@ -1,22 +0,0 @@ -# coding: utf-8 -# not sure about best place to put this class... - -module Sanitizable - - Accents = { ['á','à','â','ä','ã','Ã','Ä','Â','À'] => 'a', - ['é','è','ê','ë','Ë','É','È','Ê'] => 'e', - ['í','ì','î','ï','I','Î','Ì'] => 'i', - ['ó','ò','ô','ö','õ','Õ','Ö','Ô','Ò'] => 'o', - ['œ'] => 'oe', - ['ß'] => 'ss', - ['ú','ù','û','ü','U','Û','Ù'] => 'u', - ['ç','Ç'] => 'c' - } - - def remove_accents string - Accents.keys.each do |key| - string = string.tr(key.join, Accents[key]) - end - string - end -end diff --git a/app/views/admin/categories/new.html.erb b/app/views/admin/categories/new.html.erb index 110f11573a..57bce5cb1a 100644 --- a/app/views/admin/categories/new.html.erb +++ b/app/views/admin/categories/new.html.erb @@ -15,6 +15,13 @@ <%= text_field :category, :keywords, :class => 'large' %> +
+ +
+ <%= text_field :category, :permalink, :class => 'large' %> + <%= _("Your category slug. Leave empty if you don't know what to put here") %> +
+
diff --git a/app/views/admin/dashboard/_overview.html.erb b/app/views/admin/dashboard/_overview.html.erb index c5d70470fe..b0bf451e44 100644 --- a/app/views/admin/dashboard/_overview.html.erb +++ b/app/views/admin/dashboard/_overview.html.erb @@ -11,9 +11,8 @@ link_to(_("enable plugins"), :controller => 'sidebar') ) -%>

- <%= _("If you need help, %s. You can also browse our %s or %s to customize your Typo blog.", + <%= _("If you need help, %s. You can also %s to customize your Typo blog.", link_to(_('read our documentation'), 'http://typosphere.org'), - link_to(_('theme catalogue'), 'http://typogarden.org'), link_to(_('download some plugins'), 'http://plugins.typosphere.org')) %>

diff --git a/app/views/admin/feedback/_button.html.erb b/app/views/admin/feedback/_button.html.erb index 46dadc94f5..62b3ccdc79 100644 --- a/app/views/admin/feedback/_button.html.erb +++ b/app/views/admin/feedback/_button.html.erb @@ -3,7 +3,7 @@ <%= hidden_field_tag "confirmed", params[:confirmed] %> <%= hidden_field_tag "published", params[:published] %>