typo 5.4.4 → 5.5
Sign up to get free protection for your applications and to get access to all the features.
- data/CHANGELOG +59 -28
- data/MAINTAINERS +9 -17
- data/README +28 -20
- data/UPGRADE +6 -2
- data/app/controllers/accounts_controller.rb +1 -1
- data/app/controllers/admin/content_controller.rb +1 -1
- data/app/controllers/admin/feedback_controller.rb +3 -3
- data/app/controllers/admin/pages_controller.rb +2 -0
- data/app/controllers/application_controller.rb +6 -1
- data/app/controllers/articles_controller.rb +13 -1
- data/app/helpers/application_helper.rb +5 -2
- data/app/helpers/authors_helper.rb +14 -3
- data/app/models/article.rb +6 -4
- data/app/models/blog.rb +0 -4
- data/app/models/blog_sweeper.rb +1 -1
- data/app/models/content.rb +10 -5
- data/app/models/page_cache.rb +6 -7
- data/app/models/user.rb +1 -0
- data/app/views/admin/content/_form.html.erb +13 -11
- data/app/views/admin/content/_images.html.erb +1 -1
- data/app/views/admin/content/_simple_editor.html.erb +1 -0
- data/app/views/admin/content/_visual_editor.html.erb +1 -0
- data/app/views/admin/dashboard/_overview.html.erb +7 -7
- data/app/views/admin/pages/_form.html.erb +1 -0
- data/app/views/admin/pages/_images.html.erb +18 -0
- data/app/views/admin/pages/_simple_editor.html.erb +1 -2
- data/app/views/admin/pages/_visual_editor.html.erb +2 -1
- data/app/views/admin/pages/index.html.erb +1 -1
- data/app/views/admin/settings/feedback.html.erb +2 -1
- data/app/views/admin/tags/edit.html.erb +1 -1
- data/app/views/articles/_article.html.erb +17 -13
- data/app/views/articles/_article_content.html.erb +1 -0
- data/app/views/articles/_comment_box.html.erb +1 -1
- data/app/views/articles/_password_form.html.erb +10 -0
- data/app/views/articles/groupings.html.erb +1 -1
- data/app/views/articles/index.html.erb +1 -2
- data/app/views/articles/read.html.erb +1 -4
- data/app/views/articles/search.html.erb +1 -1
- data/app/views/layouts/administration.html.erb +1 -1
- data/app/views/shared/_search.html.erb +1 -1
- data/config/ckeditor.yml +14 -0
- data/config/environment.rb +13 -25
- data/config/environments/test.rb +1 -3
- data/config/filemanager.yml +16 -0
- data/config/initializers/access_rules.rb +5 -0
- data/config/routes.rb +5 -1
- data/db/migrate/004_add_sidebars.rb +3 -9
- data/db/migrate/089_drop_cache_information_table.rb +31 -0
- data/db/migrate/090_remove_keywords_from_posts.rb +9 -0
- data/db/migrate/091_adds_password_protection_to_posts.rb +9 -0
- data/doc/CACHE.SETUP.README +36 -0
- data/lang/de_DE.rb +6 -1
- data/lang/pl_PL.rb +221 -89
- data/lib/filemanager.rb +53 -0
- data/lib/filemanager/controller.rb +217 -0
- data/lib/i18n_interpolation_deprecation.rb +26 -0
- data/lib/rails_patch/active_support.rb +4 -0
- data/lib/tasks/release.rake +4 -131
- data/lib/typo_version.rb +1 -1
- data/public/.htaccess +6 -5
- data/public/filemanager/images/avi.gif +0 -0
- data/public/filemanager/images/box.gif +0 -0
- data/public/filemanager/images/bullet.gif +0 -0
- data/public/filemanager/images/close.gif +0 -0
- data/public/filemanager/images/closelabel.gif +0 -0
- data/public/filemanager/images/doc.gif +0 -0
- data/public/filemanager/images/donate-button.gif +0 -0
- data/public/filemanager/images/download-icon.gif +0 -0
- data/public/filemanager/images/folder.gif +0 -0
- data/public/filemanager/images/gif.gif +0 -0
- data/public/filemanager/images/htm.gif +0 -0
- data/public/filemanager/images/html.gif +0 -0
- data/public/filemanager/images/image-1.jpg +0 -0
- data/public/filemanager/images/image.gif +0 -0
- data/public/filemanager/images/jpg.gif +0 -0
- data/public/filemanager/images/loading.gif +0 -0
- data/public/filemanager/images/mov.gif +0 -0
- data/public/filemanager/images/nextlabel.gif +0 -0
- data/public/filemanager/images/pdf.gif +0 -0
- data/public/filemanager/images/png.gif +0 -0
- data/public/filemanager/images/ppt.gif +0 -0
- data/public/filemanager/images/prevlabel.gif +0 -0
- data/public/filemanager/images/rar.gif +0 -0
- data/public/filemanager/images/rm.gif +0 -0
- data/public/filemanager/images/rmvb.gif +0 -0
- data/public/filemanager/images/separator.gif +0 -0
- data/public/filemanager/images/spacer.gif +0 -0
- data/public/filemanager/images/swf.gif +0 -0
- data/public/filemanager/images/thumb-1.jpg +0 -0
- data/public/filemanager/images/tool_copy.gif +0 -0
- data/public/filemanager/images/tool_cut.gif +0 -0
- data/public/filemanager/images/tool_del.gif +0 -0
- data/public/filemanager/images/tool_folder.gif +0 -0
- data/public/filemanager/images/tool_imagemanager.gif +0 -0
- data/public/filemanager/images/tool_new.gif +0 -0
- data/public/filemanager/images/tool_paste.gif +0 -0
- data/public/filemanager/images/tool_props.gif +0 -0
- data/public/filemanager/images/tool_refresh.gif +0 -0
- data/public/filemanager/images/tool_unzip.gif +0 -0
- data/public/filemanager/images/tool_upload.gif +0 -0
- data/public/filemanager/images/tool_zip.gif +0 -0
- data/public/filemanager/images/txt.gif +0 -0
- data/public/filemanager/images/unknown.gif +0 -0
- data/public/filemanager/images/wmv.gif +0 -0
- data/public/filemanager/images/xls.gif +0 -0
- data/public/filemanager/images/zip.gif +0 -0
- data/public/filemanager/javascripts/filemanager.js +6 -0
- data/public/filemanager/javascripts/lang/en.js +31 -0
- data/public/filemanager/javascripts/lang/zh_CN.js +31 -0
- data/public/filemanager/javascripts/lightbox.js +497 -0
- data/public/filemanager/javascripts/translate.js +42 -0
- data/public/filemanager/resources/resources.txt +1 -0
- data/public/filemanager/stylesheets/filelist.css +147 -0
- data/public/filemanager/stylesheets/general.css +135 -0
- data/public/filemanager/stylesheets/lightbox.css +27 -0
- data/public/javascripts/prototype_ext.js +117 -0
- data/public/stylesheets/administration.css +19 -2
- data/themes/dirtylicious/views/articles/_article.html.erb +16 -12
- data/themes/dirtylicious/views/articles/_article_content.html.erb +1 -0
- data/themes/dirtylicious/views/articles/_password_form.html.erb +10 -0
- data/themes/scribbish/views/articles/_article.html.erb +18 -14
- data/themes/scribbish/views/articles/_article_content.html.erb +1 -0
- data/themes/scribbish/views/articles/_password_form.html.erb +10 -0
- data/themes/standard_issue/views/articles/_article.html.erb +16 -12
- data/themes/standard_issue/views/articles/_article_content.html.erb +1 -0
- data/themes/standard_issue/views/articles/_password_form.html.erb +10 -0
- data/themes/true-blue-3/helpers/theme_helper.rb +2 -2
- data/themes/true-blue-3/images/submit_form.jpg +0 -0
- data/themes/true-blue-3/stylesheets/style.css +27 -3
- data/themes/true-blue-3/views/articles/_article.html.erb +13 -8
- data/themes/true-blue-3/views/articles/_article_content.html.erb +1 -0
- data/themes/true-blue-3/views/articles/_comment_form.html.erb +1 -1
- data/themes/true-blue-3/views/articles/_password_form.html.erb +10 -0
- data/themes/true-blue-3/views/categories/_article.html.erb +5 -0
- data/themes/true-blue-3/views/tags/_article.html.erb +4 -0
- data/themes/typographic/views/articles/_article.html.erb +16 -12
- data/themes/typographic/views/articles/_article_content.html.erb +1 -0
- data/themes/typographic/views/articles/_password_form.html.erb +10 -0
- data/vendor/plugins/easy-ckeditor/app/controllers/ckeditor_controller.rb +2 -1
- data/vendor/plugins/easy-ckeditor/lib/ckeditor.rb +1 -20
- data/vendor/plugins/easy-ckeditor/{tasks → lib/tasks}/ckeditor_tasks.rake +0 -0
- data/vendor/plugins/filemanager/app/controllers/fm/filemanager_controller.rb +22 -0
- data/vendor/plugins/filemanager/app/views/fm/filemanager/index.html.erb +512 -0
- data/vendor/plugins/filemanager/app/views/fm/filemanager/view.html.erb +67 -0
- data/vendor/plugins/filemanager/filemanager.yml +16 -0
- data/vendor/plugins/static_sidebar/lib/static_sidebar.rb +4 -2
- data/vendor/plugins/typo_converter/{tasks → lib/tasks}/typo_converters_tasks.rake +0 -0
- data/vendor/plugins/typo_login_system/lib/access_control.rb +24 -1
- data/vendor/plugins/typo_textfilter_code/{tasks → lib/tasks}/typo_textfilter_code_tasks.rake +0 -0
- data/vendor/plugins/typo_textfilter_code/lib/typo_textfilter_code.rb +4 -3
- data/vendor/plugins/typo_textfilter_flickr/{tasks → lib/tasks}/typo_textfilter_flickr_tasks.rake +0 -0
- data/vendor/plugins/typo_textfilter_htmlfilter/{tasks → lib/tasks}/typo_textfilter_htmlfilter_tasks.rake +0 -0
- data/vendor/plugins/typo_textfilter_lightbox/{tasks → lib/tasks}/typo_textfilter_lightbox_tasks.rake +0 -0
- data/vendor/plugins/typo_textfilter_markdown/{tasks → lib/tasks}/typo_textfilter_markdown_tasks.rake +0 -0
- data/vendor/plugins/typo_textfilter_none/{tasks → lib/tasks}/typo_textfilter_none_tasks.rake +0 -0
- data/vendor/plugins/typo_textfilter_smartypants/{tasks → lib/tasks}/typo_textfilter_smartypants_tasks.rake +0 -0
- data/vendor/plugins/typo_textfilter_textile/{tasks → lib/tasks}/typo_textfilter_textile_tasks.rake +0 -0
- data/vendor/plugins/typo_textfilter_textile_and_markdown/{tasks → lib/tasks}/typo_textfilter_textile_and_markdown_tasks.rake +0 -0
- data/vendor/plugins/xml_sidebar/views/content.rhtml +1 -1
- metadata +190 -195
- data/app/controllers/admin/cache_controller.rb +0 -9
- data/app/models/cache_information.rb +0 -19
- data/db/schema.rb +0 -242
- data/doc/test_themes.rb +0 -50
- data/public/javascripts/ckeditor/config.js +0 -27
- data/spec/controllers/accounts_controller_spec.rb +0 -414
- data/spec/controllers/admin/cache_controller_spec.rb +0 -18
- data/spec/controllers/admin/categories_controller_spec.rb +0 -73
- data/spec/controllers/admin/content_controller_spec.rb +0 -443
- data/spec/controllers/admin/dashboard_controller_spec.rb +0 -13
- data/spec/controllers/admin/feedback_controller_spec.rb +0 -308
- data/spec/controllers/admin/pages_controller_spec.rb +0 -80
- data/spec/controllers/admin/profiles_controller_spec.rb +0 -22
- data/spec/controllers/admin/resources_controller_spec.rb +0 -53
- data/spec/controllers/admin/settings_controller_spec.rb +0 -80
- data/spec/controllers/admin/tags_controller_spec.rb +0 -64
- data/spec/controllers/admin/textfilters_controller_spec.rb +0 -20
- data/spec/controllers/admin/themes_controller_spec.rb +0 -30
- data/spec/controllers/admin/users_controller_spec.rb +0 -109
- data/spec/controllers/application_controller_spec.rb +0 -18
- data/spec/controllers/articles_controller_spec.rb +0 -440
- data/spec/controllers/authors_controller_spec.rb +0 -42
- data/spec/controllers/backend_controller_spec.rb +0 -337
- data/spec/controllers/categories_controller_spec.rb +0 -117
- data/spec/controllers/comments_controller_spec.rb +0 -137
- data/spec/controllers/routes/articles_routing_spec.rb +0 -31
- data/spec/controllers/routes/xml_routing_spec.rb +0 -71
- data/spec/controllers/setup_controller_spec.rb +0 -24
- data/spec/controllers/tags_controller_spec.rb +0 -147
- data/spec/controllers/textfilter_controller_spec.rb +0 -192
- data/spec/controllers/theme_controller_spec.rb +0 -39
- data/spec/controllers/xml_controller_spec.rb +0 -185
- data/spec/factories.rb +0 -69
- data/spec/helpers/application_helper_spec.rb +0 -25
- data/spec/helpers/content_helper_spec.rb +0 -28
- data/spec/lib/text_filter_plugin_spec.rb +0 -15
- data/spec/models/amazon_sidebar_spec.rb +0 -40
- data/spec/models/article_closing_spec.rb +0 -42
- data/spec/models/article_spec.rb +0 -515
- data/spec/models/blog_spec.rb +0 -116
- data/spec/models/cache_information_spec.rb +0 -42
- data/spec/models/cache_support_spec.rb +0 -51
- data/spec/models/category_spec.rb +0 -44
- data/spec/models/comment_spec.rb +0 -240
- data/spec/models/configuration_spec.rb +0 -91
- data/spec/models/content_state/feedback_states_spec.rb +0 -64
- data/spec/models/notification_spec.rb +0 -8
- data/spec/models/page_cache_spec.rb +0 -30
- data/spec/models/page_spec.rb +0 -91
- data/spec/models/ping_pinger_spec.rb +0 -33
- data/spec/models/ping_spec.rb +0 -154
- data/spec/models/redirect_spec.rb +0 -17
- data/spec/models/resource_spec.rb +0 -39
- data/spec/models/route_cache_spec.rb +0 -11
- data/spec/models/sidebar_spec.rb +0 -7
- data/spec/models/static_sidebar_spec.rb +0 -17
- data/spec/models/tag_spec.rb +0 -65
- data/spec/models/text_filter_spec.rb +0 -34
- data/spec/models/theme_spec.rb +0 -45
- data/spec/models/trackback_spec.rb +0 -60
- data/spec/models/trigger_spec.rb +0 -40
- data/spec/models/user_spec.rb +0 -198
- data/spec/rcov.opts +0 -2
- data/spec/spec.opts +0 -4
- data/spec/spec_helper.rb +0 -133
- data/spec/views/articles/index_spec.rb +0 -63
- data/spec/views/articles/read_spec.rb +0 -67
- data/spec/views/comments/html_sanitization_spec.rb +0 -119
- data/test/fixtures/blogs.yml +0 -27
- data/test/fixtures/categories.yml +0 -29
- data/test/fixtures/categorizations.yml +0 -31
- data/test/fixtures/contents.yml +0 -231
- data/test/fixtures/feedback.yml +0 -180
- data/test/fixtures/notification_mailer/article +0 -3
- data/test/fixtures/notification_mailer/comment +0 -3
- data/test/fixtures/notification_mailer/trackback +0 -3
- data/test/fixtures/notifications.yml +0 -0
- data/test/fixtures/page_caches.yml +0 -7
- data/test/fixtures/profiles.yml +0 -27
- data/test/fixtures/redirects.yml +0 -10
- data/test/fixtures/resources.yml +0 -21
- data/test/fixtures/sidebars.yml +0 -10
- data/test/fixtures/tags.yml +0 -10
- data/test/fixtures/text_filters.yml +0 -37
- data/test/fixtures/triggers.yml +0 -1
- data/test/fixtures/users.yml +0 -101
- data/test/mocks/test/dns_mock.rb +0 -13
- data/test/mocks/test/flickr_mock.rb +0 -30
- data/test/mocks/test/http_mock.rb +0 -39
- data/test/mocks/test/theme_mock.rb +0 -5
- data/test/mocks/test/xmlrpc_mock.rb +0 -28
- data/test/mocks/themes/123-numbers-in-path/about.markdown +0 -0
- data/test/mocks/themes/CamelCaseDirectory/about.markdown +0 -0
- data/test/mocks/themes/i-have-special-chars/about.markdown +0 -0
- data/test/mocks/themes/typographic/about.markdown +0 -7
- data/test/mocks/themes/typographic/images/Thumbs.db +0 -0
- data/test/mocks/themes/typographic/images/accept.png +0 -0
- data/test/mocks/themes/typographic/images/accept50.png +0 -0
- data/test/mocks/themes/typographic/images/bg_body.jpg +0 -0
- data/test/mocks/themes/typographic/images/bg_white.png +0 -0
- data/test/mocks/themes/typographic/images/bg_wrapper.jpg +0 -0
- data/test/mocks/themes/typographic/images/bullet_bottom.png +0 -0
- data/test/mocks/themes/typographic/images/bullet_right.png +0 -0
- data/test/mocks/themes/typographic/images/email_open.png +0 -0
- data/test/mocks/themes/typographic/images/email_open50.png +0 -0
- data/test/mocks/themes/typographic/images/meta.png +0 -0
- data/test/mocks/themes/typographic/images/page_edit.png +0 -0
- data/test/mocks/themes/typographic/images/page_edit50.png +0 -0
- data/test/mocks/themes/typographic/images/tag.png +0 -0
- data/test/mocks/themes/typographic/images/user.png +0 -0
- data/test/mocks/themes/typographic/images/user50.png +0 -0
- data/test/mocks/themes/typographic/images/world_link.png +0 -0
- data/test/mocks/themes/typographic/images/world_link50.png +0 -0
- data/test/mocks/themes/typographic/layouts/default.html.erb +0 -42
- data/test/mocks/themes/typographic/preview.png +0 -0
- data/test/mocks/themes/typographic/stylesheets/colors.css +0 -51
- data/test/mocks/themes/typographic/stylesheets/layout.css +0 -346
- data/test/mocks/themes/typographic/stylesheets/reset.css +0 -5
- data/test/mocks/themes/typographic/stylesheets/style.css +0 -36
- data/test/mocks/themes/typographic/views/articles/_article.html.erb +0 -41
- data/test/mocks/themes/typographic/views/articles/_comment.html.erb +0 -14
- data/test/mocks/themes/typographic/views/articles/_comment_form.html.erb +0 -48
- data/test/mocks/themes/typographic/views/articles/_comment_list.html.erb +0 -7
- data/test/mocks/themes/typographic/views/articles/_trackback.html.erb +0 -9
- data/test/mocks/themes/typographic/views/articles/comment_preview.html.erb +0 -10
- data/test/mocks/themes/typographic/views/articles/index.html.erb +0 -5
- data/test/mocks/themes/typographic/views/articles/read.html.erb +0 -42
- data/test/mocks/themes/typographic/views/shared/_search.html.erb +0 -17
- data/test/mocks/themes/typographic/views/theme/static_view_test.html.erb +0 -1
- data/test/test_helper.rb +0 -13
- data/themes/true-blue-3/images/frederic-de-villamil.jpg +0 -0
- data/themes/true-blue-3/images/textarea_bg.jpg +0 -0
Binary file
|
@@ -1,51 +0,0 @@
|
|
1
|
-
/*------------------------------------------------------------------
|
2
|
-
# [Color codes]
|
3
|
-
|
4
|
-
# Dark grey (h1,h3): #3d3d3d
|
5
|
-
# Mid grey (header des): #787878
|
6
|
-
# Mid grey (h2, links:hover, h2 a, form#commentform) : #5d5d5d
|
7
|
-
# Black (text) : #000
|
8
|
-
# Blue (links) #288aaa
|
9
|
-
# Light grey (meta, footer) : #8b8b8b
|
10
|
-
# Dark orange (border .title) : #e8d1b6
|
11
|
-
# Orange (border images, input, textarea) : #f4c997
|
12
|
-
# Light orange (body background) : #ffebd6
|
13
|
-
# Light brown (footer border) : #e1d8ce
|
14
|
-
# */
|
15
|
-
|
16
|
-
body {
|
17
|
-
color : #000;
|
18
|
-
background-color: #ffebd6;
|
19
|
-
}
|
20
|
-
|
21
|
-
h1, h3, h1 a {
|
22
|
-
color: #3d3d3d
|
23
|
-
}
|
24
|
-
|
25
|
-
#header p.desc {
|
26
|
-
color :#787878;
|
27
|
-
}
|
28
|
-
|
29
|
-
h2, a:hover, h2 a, #commentform label, #commentform input {
|
30
|
-
color: #5d5d5d
|
31
|
-
}
|
32
|
-
|
33
|
-
a {
|
34
|
-
color: #288aaa
|
35
|
-
}
|
36
|
-
|
37
|
-
div.meta, #footer {
|
38
|
-
color: #8b8b8b
|
39
|
-
}
|
40
|
-
|
41
|
-
div.atomentry div.title {
|
42
|
-
border-color: #e8d1b6
|
43
|
-
}
|
44
|
-
|
45
|
-
div.atomentry div.content img, input, textarea {
|
46
|
-
border-color: #f4c997
|
47
|
-
}
|
48
|
-
|
49
|
-
#footer {
|
50
|
-
border-color: #e1d8ce
|
51
|
-
}
|
@@ -1,346 +0,0 @@
|
|
1
|
-
|
2
|
-
/*
|
3
|
-
1. Body
|
4
|
-
2. Wrapper
|
5
|
-
3. Header / #header
|
6
|
-
3.1. Logo / #logo
|
7
|
-
3.2. Menu / #menu
|
8
|
-
4. Page
|
9
|
-
4.1. Content / #content
|
10
|
-
4.1.1. Post / .atomentry
|
11
|
-
4.1.2. Comments
|
12
|
-
4.2. Sidebar / #sidebar
|
13
|
-
4.2.1. Search / #search
|
14
|
-
4.2.2. Loading / #loading
|
15
|
-
4.2.4. Results / #results
|
16
|
-
4.2.5. Categories / #categories
|
17
|
-
5. Footer / #footer
|
18
|
-
*/
|
19
|
-
|
20
|
-
|
21
|
-
/*------------------------------------------------------------------
|
22
|
-
[1. Body]
|
23
|
-
*/
|
24
|
-
body {
|
25
|
-
font-family: "Century Gothic", Arial, Verdana, sans-serif;
|
26
|
-
font-size: 0.9em;
|
27
|
-
background:url(../../images/theme/bg_body.jpg) top center no-repeat;
|
28
|
-
}
|
29
|
-
|
30
|
-
input, textarea {
|
31
|
-
border: solid 1px;
|
32
|
-
font-family: "Century Gothic", Arial, Verdana, sans-serif;
|
33
|
-
}
|
34
|
-
|
35
|
-
a {
|
36
|
-
}
|
37
|
-
a:hover {
|
38
|
-
text-decoration: none;
|
39
|
-
}
|
40
|
-
|
41
|
-
/*------------------------------------------------------------------
|
42
|
-
[2. Wrapper]
|
43
|
-
*/
|
44
|
-
wrapper {
|
45
|
-
background:url(../../images/theme/bg_wrapper.jpg) bottom left repeat-x;
|
46
|
-
}
|
47
|
-
|
48
|
-
/*------------------------------------------------------------------
|
49
|
-
[3. Header]
|
50
|
-
*/
|
51
|
-
|
52
|
-
#header {
|
53
|
-
max-width: 1000px;
|
54
|
-
min-width: 400px;
|
55
|
-
margin:50px auto 55px auto;
|
56
|
-
position: relative;
|
57
|
-
text-align:right;
|
58
|
-
}
|
59
|
-
|
60
|
-
p.desc {
|
61
|
-
font-size: 0.8em;
|
62
|
-
}
|
63
|
-
|
64
|
-
h1 a {
|
65
|
-
text-decoration : none;
|
66
|
-
font-weight:normal;
|
67
|
-
font-size: 1.6em;
|
68
|
-
}
|
69
|
-
|
70
|
-
/*------------------------------------------------------------------
|
71
|
-
[4. Page]
|
72
|
-
*/
|
73
|
-
#page {
|
74
|
-
max-width: 1000px;
|
75
|
-
min-width: 400px;
|
76
|
-
margin-left:auto;
|
77
|
-
margin-right: auto;
|
78
|
-
position: relative;
|
79
|
-
}
|
80
|
-
|
81
|
-
/*------------------------------------------------------------------
|
82
|
-
[4.1. Content]
|
83
|
-
*/
|
84
|
-
|
85
|
-
#content {
|
86
|
-
margin-right: 250px;
|
87
|
-
}
|
88
|
-
|
89
|
-
|
90
|
-
/*------------------------------------------------------------------
|
91
|
-
[4.1.1. Post]
|
92
|
-
*/
|
93
|
-
|
94
|
-
div.atomentry {
|
95
|
-
margin-bottom:75px;
|
96
|
-
}
|
97
|
-
|
98
|
-
div.atomentry div.title {
|
99
|
-
border-left: 10px solid;
|
100
|
-
padding-left: 10px;
|
101
|
-
margin-bottom: 15px;
|
102
|
-
}
|
103
|
-
|
104
|
-
div.title cite {
|
105
|
-
font-style:normal;
|
106
|
-
}
|
107
|
-
|
108
|
-
div.title abbr {
|
109
|
-
border:none;
|
110
|
-
}
|
111
|
-
|
112
|
-
h2.title a {
|
113
|
-
text-decoration : none;
|
114
|
-
font-weight:normal;
|
115
|
-
font-size:1.6em
|
116
|
-
}
|
117
|
-
|
118
|
-
div.meta {
|
119
|
-
font-size: 0.7em;
|
120
|
-
}
|
121
|
-
|
122
|
-
div.atomentry img {
|
123
|
-
border: solid 1px;
|
124
|
-
padding: 5px;
|
125
|
-
}
|
126
|
-
|
127
|
-
img.right {
|
128
|
-
float:right;
|
129
|
-
margin-left:10px;
|
130
|
-
margin-bottom:5px;
|
131
|
-
}
|
132
|
-
|
133
|
-
img.left {
|
134
|
-
float:left;
|
135
|
-
margin-right:10px;
|
136
|
-
margin-bottom:5px;
|
137
|
-
}
|
138
|
-
|
139
|
-
div.atomentry div.content p {
|
140
|
-
margin-top: 5px;
|
141
|
-
margin-bottom: 15px;
|
142
|
-
}
|
143
|
-
p.links {
|
144
|
-
text-align:right;
|
145
|
-
margin-top:15px;
|
146
|
-
}
|
147
|
-
|
148
|
-
a.more, a.comments {
|
149
|
-
background:url(../../images/theme/bullet_right.png) no-repeat 0 70%;
|
150
|
-
padding-left:15px;
|
151
|
-
margin-left: 35px;
|
152
|
-
font-size:0.8em;
|
153
|
-
}
|
154
|
-
|
155
|
-
a.more:hover, a.comments:hover {
|
156
|
-
background-image:url(../../images/theme/bullet_bottom.png)
|
157
|
-
}
|
158
|
-
|
159
|
-
p.infos {
|
160
|
-
background:url(../../images/theme/meta.png) no-repeat;
|
161
|
-
min-height:18px;
|
162
|
-
padding-left: 20px;
|
163
|
-
font-size:1.2em
|
164
|
-
}
|
165
|
-
|
166
|
-
p.tags {
|
167
|
-
background:url(../../images/theme/tag.png) no-repeat;
|
168
|
-
min-height: 18px;
|
169
|
-
padding: 2px 0 0 20px;
|
170
|
-
font-size:1.2em
|
171
|
-
}
|
172
|
-
/*------------------------------------------------------------------
|
173
|
-
[4.1.2. Comments]
|
174
|
-
*/
|
175
|
-
|
176
|
-
#commentform {
|
177
|
-
background:url(../../images/theme/bg_white.png);
|
178
|
-
padding:10px 35px 25px 10px
|
179
|
-
}
|
180
|
-
|
181
|
-
#commentform input {
|
182
|
-
width:180px;
|
183
|
-
padding:3px 3px 3px 23px;
|
184
|
-
margin: 15px;
|
185
|
-
}
|
186
|
-
|
187
|
-
#commentform textarea {
|
188
|
-
padding:3px;
|
189
|
-
margin: 15px 0 15px 15px;
|
190
|
-
font-size:1em;
|
191
|
-
width:480px;
|
192
|
-
}
|
193
|
-
|
194
|
-
#commentform label {
|
195
|
-
float:left;
|
196
|
-
width: 150px;
|
197
|
-
text-align:right;
|
198
|
-
height:30px;
|
199
|
-
padding-top:15px;
|
200
|
-
margin-left: 50px;
|
201
|
-
line-height:0.7em
|
202
|
-
}
|
203
|
-
|
204
|
-
#commentform label small {
|
205
|
-
font-size:0.6em
|
206
|
-
}
|
207
|
-
|
208
|
-
input#comment_author {
|
209
|
-
background:url(../../images/theme/user50.png) no-repeat #FFF 2% 50%;
|
210
|
-
}
|
211
|
-
|
212
|
-
input#comment_author:hover {
|
213
|
-
background:url(../../images/theme/user.png) no-repeat #FFF 2% 50%;
|
214
|
-
}
|
215
|
-
|
216
|
-
input#comment_email {
|
217
|
-
background:url(../../images/theme/email_open50.png) no-repeat #FFF 2% 50%;
|
218
|
-
}
|
219
|
-
|
220
|
-
input#comment_email:hover {
|
221
|
-
background:url(../../images/theme/email_open.png) no-repeat #FFF 2% 50%;
|
222
|
-
}
|
223
|
-
|
224
|
-
input#comment_url {
|
225
|
-
background:url(../../images/theme/world_link50.png) no-repeat #FFF 2% 50%;
|
226
|
-
}
|
227
|
-
|
228
|
-
input#comment_url:hover {
|
229
|
-
background:url(../../images/theme/world_link.png) no-repeat #FFF 2% 50%;
|
230
|
-
}
|
231
|
-
|
232
|
-
input#form-preview-button {
|
233
|
-
background:url(../../images/theme/page_edit50.png) no-repeat #f6e0c6 2% 50%;
|
234
|
-
width: 110px;
|
235
|
-
margin:0
|
236
|
-
}
|
237
|
-
|
238
|
-
input#form-preview-button:hover {
|
239
|
-
background:url(../../images/theme/page_edit.png) no-repeat #f6e0c6 2% 50%;
|
240
|
-
}
|
241
|
-
|
242
|
-
|
243
|
-
input#form-submit-button {
|
244
|
-
background:url(../../images/theme/accept50.png) no-repeat #f6e0c6 2% 50%;
|
245
|
-
width: 110px;
|
246
|
-
margin:0
|
247
|
-
}
|
248
|
-
|
249
|
-
input#form-submit-button:hover {
|
250
|
-
background:url(../../images/theme/accept.png) no-repeat #f6e0c6 2% 50%;
|
251
|
-
}
|
252
|
-
|
253
|
-
ol#commentList {
|
254
|
-
margin-left: 25px;
|
255
|
-
}
|
256
|
-
|
257
|
-
ol#commentList li {
|
258
|
-
margin: 10px 0 10px 0
|
259
|
-
}
|
260
|
-
|
261
|
-
div.commentContent {
|
262
|
-
padding:10px;
|
263
|
-
background:url(../../images/theme/bg_white.png);
|
264
|
-
margin:5px 0 0 0
|
265
|
-
|
266
|
-
}
|
267
|
-
|
268
|
-
div.author cite {
|
269
|
-
font-style:normal
|
270
|
-
}
|
271
|
-
|
272
|
-
h2#trackbacks-title, h2#comments-title, h2#formComments-title{
|
273
|
-
font-weight:normal;
|
274
|
-
font-size:1.6em;
|
275
|
-
margin-top:65px;
|
276
|
-
line-height:0.8em;
|
277
|
-
}
|
278
|
-
|
279
|
-
p.trackbackurl span {
|
280
|
-
font-size: 0.8em
|
281
|
-
}
|
282
|
-
|
283
|
-
p.buttons {
|
284
|
-
clear:left;
|
285
|
-
text-align:right
|
286
|
-
}
|
287
|
-
|
288
|
-
p.buttons input {
|
289
|
-
width: 110px
|
290
|
-
}
|
291
|
-
/*------------------------------------------------------------------
|
292
|
-
[4.2. Sidebar]
|
293
|
-
*/
|
294
|
-
#sidebar {
|
295
|
-
float:right;
|
296
|
-
position: relative;
|
297
|
-
right:0;
|
298
|
-
top:0;
|
299
|
-
width:220px;
|
300
|
-
text-align:right;
|
301
|
-
font-size:
|
302
|
-
}
|
303
|
-
|
304
|
-
h3 {
|
305
|
-
margin-top:25px;
|
306
|
-
font-size:1.7em;
|
307
|
-
font-weight:normal;
|
308
|
-
line-height:0.9em;
|
309
|
-
}
|
310
|
-
|
311
|
-
|
312
|
-
div.static-body, ul, #sform p {
|
313
|
-
background:url(../../images/theme/bg_white.png);
|
314
|
-
padding:14px
|
315
|
-
}
|
316
|
-
|
317
|
-
div.static-body ul {
|
318
|
-
background:none;
|
319
|
-
padding:0;
|
320
|
-
}
|
321
|
-
|
322
|
-
ul li {
|
323
|
-
list-style-type:none;
|
324
|
-
background:url(../../images/theme/bullet_right.png) 98% 70% no-repeat;
|
325
|
-
padding-right: 17px;
|
326
|
-
}
|
327
|
-
|
328
|
-
#sform input {
|
329
|
-
width:180px;
|
330
|
-
padding:5px;
|
331
|
-
}
|
332
|
-
|
333
|
-
/*------------------------------------------------------------------
|
334
|
-
[5. Footer]
|
335
|
-
*/
|
336
|
-
#footer {
|
337
|
-
max-width: 1000px;
|
338
|
-
min-width: 400px;
|
339
|
-
margin: 50px auto 0 auto;
|
340
|
-
position: relative;
|
341
|
-
text-align:center;
|
342
|
-
padding:5px;
|
343
|
-
border-top: solid 1px;
|
344
|
-
font-size: 0.6em;
|
345
|
-
clear:both
|
346
|
-
}
|
@@ -1,36 +0,0 @@
|
|
1
|
-
/* CSS Document */
|
2
|
-
/*------------------------------------------------------------------
|
3
|
-
[Master Stylesheet]
|
4
|
-
|
5
|
-
Project: TypoGraphic
|
6
|
-
Version: 1.0
|
7
|
-
Last change: 04/06/08 [fixed Float bug, vf]
|
8
|
-
Assigned to: Helene Douchet (hdo)
|
9
|
-
|
10
|
-
[Table of contents]
|
11
|
-
|
12
|
-
1. Body
|
13
|
-
2. Wrapper
|
14
|
-
3. Header / #header
|
15
|
-
4. Page
|
16
|
-
4.1. Content / #content
|
17
|
-
4.1.1. Post / .atomentry
|
18
|
-
4.2. Sidebar / #sidebar
|
19
|
-
4.2.1. Search / #search
|
20
|
-
4.2.2. Loading / #loading
|
21
|
-
4.2.4. Results / #results
|
22
|
-
4.2.5. Categories / #categories
|
23
|
-
5. Footer / #footer
|
24
|
-
-------------------------------------------------------------------*/
|
25
|
-
|
26
|
-
@import "reset.css";
|
27
|
-
@import "layout.css";
|
28
|
-
@import "colors.css";
|
29
|
-
/* @import "debugging.css"; */
|
30
|
-
|
31
|
-
|
32
|
-
|
33
|
-
|
34
|
-
|
35
|
-
|
36
|
-
|
@@ -1,41 +0,0 @@
|
|
1
|
-
<div class="atomentry" id="article-<%= article.id %>">
|
2
|
-
<div class="title">
|
3
|
-
<h2 class="title"><%= (controller.action_name.include? 'permalink') ? article.title : link_to_permalink(article,article.title) %></h2>
|
4
|
-
<div class="meta">
|
5
|
-
<%= _("Posted by") %> <cite><%= author_link(article) %></cite> <abbr class="published" title="<%= article.published_at.xmlschema %>"><%= js_distance_of_time_in_words_to_now article.published_at %></abbr>
|
6
|
-
</div>
|
7
|
-
</div>
|
8
|
-
<div class="content">
|
9
|
-
<%= article.html(:body) %>
|
10
|
-
|
11
|
-
<% if article.extended? -%>
|
12
|
-
<div class="extended">
|
13
|
-
<% if controller.action_name == 'index' -%>
|
14
|
-
<p><%= link_to_permalink article,_("Continue reading...") %></p>
|
15
|
-
<% else -%>
|
16
|
-
<%= article.html(:extended) %>
|
17
|
-
<% end -%>
|
18
|
-
</div>
|
19
|
-
<% end -%>
|
20
|
-
</div>
|
21
|
-
<% if controller.controller_name == "articles" and controller.action_name == "show" %>
|
22
|
-
<div class="meta">
|
23
|
-
<p class="infos"><small>
|
24
|
-
<%= _("This entry was posted on %s", content_tag(:abbr, js_distance_of_time_in_words_to_now (@article.published_at), {:class => 'published', :title => @article.published_at.xmlschema})) %>
|
25
|
-
<%= _("and %s", category_links(@article)) unless @article.categories.empty? %>.
|
26
|
-
<%= _("You can follow any any response to this entry through the %s", link_to(_("Atom feed"), @auto_discovery_url_atom)) %>.
|
27
|
-
<%= _("You can leave a %s", link_to_permalink(article, _('comment'), 'comments')) if @article.allow_comments? %>
|
28
|
-
<%= _("or a %s from your own site", link_to_permalink(@article, _('trackback'), 'trackbacks')) if @article.allow_pings? %>.
|
29
|
-
</small></p>
|
30
|
-
<p class="tags">
|
31
|
-
<%= tag_links(@article) unless @article.tags.empty? %>
|
32
|
-
</p>
|
33
|
-
</div>
|
34
|
-
<% else %>
|
35
|
-
<p class="links">
|
36
|
-
<%= link_to_permalink(article, _("Read full article"), nil, 'more') if controller.action_name != 'permalink' %>
|
37
|
-
<%= link_to_permalink(article,pluralize(article.published_comments.size, _('no comments') , _('1 comment'), __('%d comments') ),'comments', 'comments') %>
|
38
|
-
</p>
|
39
|
-
<% end %>
|
40
|
-
<br style="clear:both;" />
|
41
|
-
</div>
|