Changes in [3236:b55d50fc4301:3237:f77fcf59c4b7]
- Files:
-
- 1 deleted
- 40 edited
-
.hgsubstate (modified) (1 diff)
-
admin/blog_pref.php (modified) (2 diffs)
-
admin/categories.php (modified) (2 diffs)
-
admin/category.php (modified) (3 diffs)
-
admin/index.php (modified) (1 diff)
-
admin/js/_blog_pref.js (modified) (1 diff)
-
admin/js/jsUpload/vendor/jquery.ui.widget.js (deleted)
-
admin/post.php (modified) (2 diffs)
-
admin/posts.php (modified) (1 diff)
-
inc/.htaccess (modified) (1 diff)
-
inc/admin/lib.dc.page.php (modified) (2 diffs)
-
inc/core/class.dc.auth.php (modified) (2 diffs)
-
inc/core/class.dc.core.php (modified) (4 diffs)
-
inc/core/class.dc.namespace.php (modified) (2 diffs)
-
inc/core/class.dc.workspace.php (modified) (1 diff)
-
inc/dbschema/db-schema.php (modified) (16 diffs)
-
inc/dbschema/upgrade.php (modified) (1 diff)
-
inc/prepend.php (modified) (2 diffs)
-
inc/public/default-templates/currywurst/__layout.html (modified) (2 diffs)
-
inc/public/default-templates/currywurst/archive.html (modified) (1 diff)
-
inc/public/default-templates/currywurst/atom-comments.xml (modified) (1 diff)
-
inc/public/default-templates/currywurst/atom.xml (modified) (1 diff)
-
inc/public/default-templates/currywurst/rss2-comments.xml (modified) (1 diff)
-
inc/public/default-templates/currywurst/rss2.xml (modified) (1 diff)
-
inc/public/default-templates/currywurst/search.html (modified) (1 diff)
-
inc/public/default-templates/mustek/__layout.html (modified) (2 diffs)
-
inc/public/default-templates/mustek/atom-comments.xml (modified) (1 diff)
-
inc/public/default-templates/mustek/atom.xml (modified) (1 diff)
-
inc/public/default-templates/mustek/rss2-comments.xml (modified) (1 diff)
-
inc/public/default-templates/mustek/rss2.xml (modified) (1 diff)
-
locales/en/main.po (modified) (1 diff)
-
locales/fr/main.po (modified) (4 diffs)
-
plugins/.htaccess (modified) (1 diff)
-
plugins/antispam/inc/lib.dc.antispam.php (modified) (1 diff)
-
plugins/widgets/class.widgets.php (modified) (1 diff)
-
plugins/widgets/index.php (modified) (1 diff)
-
plugins/widgets/widgets.js (modified) (1 diff)
-
tests/functional/index.html (modified) (3 diffs)
-
themes/berlin/scss/partials/_sidebar.scss (modified) (1 diff)
-
themes/berlin/style.css (modified) (23 diffs)
-
themes/ductile/tpl/home.html (modified) (2 diffs)
Legend:
- Unmodified
- Added
- Removed
-
.hgsubstate
r3165 r3230 1 67f64a6c2eacdb9cd8f75186d6b6e4b98a91e8bainc/libs/clearbricks1 9be5ccd717f30ae129bb4acffe26d6e14a2af690 inc/libs/clearbricks -
admin/blog_pref.php
r3159 r3227 312 312 } 313 313 314 $desc_editor = $core->auth->getOption('editor'); 315 314 316 dcPage::open(__('Blog settings'), 315 317 '<script type="text/javascript">'."\n". … … 322 324 "</script>". 323 325 dcPage::jsConfirmClose('blog-form'). 324 $core->callBehavior('adminPostEditor' ).326 $core->callBehavior('adminPostEditor',$desc_editor['xhtml'],'blog_desc',array('#blog_desc'),'xhtml'). 325 327 dcPage::jsLoad('js/_blog_pref.js'). 326 328 -
admin/categories.php
r2852 r3210 51 51 $c = $core->blog->getCategory($mov_cat); 52 52 if ($c->isEmpty()) { 53 throw new Exception(__('Category where to move posts does not exist'));53 throw new Exception(__('Category where to move entries does not exist')); 54 54 } 55 55 $name = $c->cat_title; … … 100 100 /* Display 101 101 -------------------------------------------------------- */ 102 $rs = $core->blog->getCategories( array('post_type'=>'post'));102 $rs = $core->blog->getCategories(); 103 103 104 104 $starting_script = ""; -
admin/category.php
r3024 r3209 46 46 47 47 # Allowed parents list 48 $children = $core->blog->getCategories(array(' post_type'=>'post','start'=>$cat_id));48 $children = $core->blog->getCategories(array('start'=>$cat_id)); 49 49 $allowed_parents = array(__('Top level')=>0); 50 50 … … 54 54 } 55 55 56 $rs = $core->blog->getCategories( array('post_type'=>'post'));56 $rs = $core->blog->getCategories(); 57 57 while ($rs->fetch()) { 58 58 if (!isset($p[$rs->cat_id])) { … … 195 195 if (!$cat_id) 196 196 { 197 $rs = $core->blog->getCategories( array('post_type'=>'post'));197 $rs = $core->blog->getCategories(); 198 198 echo 199 199 '<p><label for="new_cat_parent">'.__('Parent:').' '. -
admin/index.php
r3189 r3209 337 337 # Getting categories 338 338 $categories_combo = dcAdminCombos::getCategoriesCombo( 339 $core->blog->getCategories(array( 'post_type'=>'post'))339 $core->blog->getCategories(array()) 340 340 ); 341 341 -
admin/js/_blog_pref.js
r3005 r3227 30 30 $(this).parent().next('.chosen').html($(this).find(':selected').prop('label')); 31 31 }); 32 33 // HTML text editor 34 if ($.isFunction(jsToolBar)) { 35 $('#blog_desc').each(function() { 36 var tbWidgetText = new jsToolBar(this); 37 tbWidgetText.draw('xhtml'); 38 }); 39 } 40 32 41 }); -
admin/post.php
r3024 r3209 52 52 # Getting categories 53 53 $categories_combo = dcAdminCombos::getCategoriesCombo( 54 $core->blog->getCategories( array('post_type'=>'post'))54 $core->blog->getCategories() 55 55 ); 56 56 … … 335 335 # Getting categories 336 336 $categories_combo = dcAdminCombos::getCategoriesCombo( 337 $core->blog->getCategories( array('post_type'=>'post'))337 $core->blog->getCategories() 338 338 ); 339 339 /* DISPLAY -
admin/posts.php
r3182 r3209 17 17 # Getting categories 18 18 try { 19 $categories = $core->blog->getCategories( array('post_type'=>'post'));19 $categories = $core->blog->getCategories(); 20 20 } catch (Exception $e) { 21 21 $core->error->add($e->getMessage()); -
inc/.htaccess
r0 r3220 1 Require all denied 1 2 Deny from all -
inc/admin/lib.dc.page.php
r3178 r3224 298 298 299 299 $figure = " 300 @..@ 301 (----) 302 ( >__< ) 303 ^^ ~~ ^^ 304 "; 300 /\_/\ 301 (='.'=) 302 (\")-(\") 303 "; 305 304 306 305 echo … … 911 910 "</script>\n". 912 911 913 self::jsLoad('js/j sUpload/vendor/jquery.ui.widget.js').912 self::jsLoad('js/jquery/jquery-ui.custom.js'). 914 913 self::jsLoad('js/jsUpload/tmpl.js'). 915 914 self::jsLoad('js/jsUpload/template-upload.js'). -
inc/core/class.dc.auth.php
r3036 r3231 172 172 public function crypt($pwd) 173 173 { 174 return crypt::hmac(DC_MASTER_KEY,$pwd );174 return crypt::hmac(DC_MASTER_KEY,$pwd,DC_CRYPT_ALGO); 175 175 } 176 176 … … 310 310 311 311 $user_id = trim(@pack('a32',substr($code,0,32))); 312 $pwd = @unpack('H 40hex',substr($code,32,40));312 $pwd = @unpack('H*hex',substr($code,32)); 313 313 314 314 if ($user_id === false || $pwd === false) { -
inc/core/class.dc.core.php
r3216 r3231 198 198 public function checkNonce($secret) 199 199 { 200 // 40 alphanumeric characters min 200 201 if (!preg_match('/^([0-9a-f]{40,})$/i',$secret)) { 201 202 return false; … … 1206 1207 'active_quote' => 1, 1207 1208 'active_pre' => 1, 1209 'active_aside' => 1, 1208 1210 'active_empty' => 1, 1209 1211 'active_auto_br' => 0, … … 1252 1254 'active_quote' => 0, 1253 1255 'active_pre' => 0, 1256 'active_aside' => 0, 1254 1257 'active_empty' => 0, 1255 1258 'active_auto_br' => 1, … … 1292 1295 'active_quote' => 0, 1293 1296 'active_pre' => 1, 1297 'active_aside' => 0, 1294 1298 'active_empty' => 0, 1295 1299 'active_auto_br' => 1, -
inc/core/class.dc.namespace.php
r3203 r3225 391 391 392 392 /** 393 Returns $ns property content. 394 395 @return <b>string</b> 396 */ 397 public function dumpNamespace() 398 { 399 return $this->ns; 400 } 401 402 /** 393 403 Returns $settings property content. 394 404 … … 401 411 402 412 /** 413 Returns $local_settings property content. 414 415 @return <b>array</b> 416 */ 417 public function dumpLocalSettings() 418 { 419 return $this->local_settings; 420 } 421 422 /** 403 423 Returns $global_settings property content. 404 424 -
inc/core/class.dc.workspace.php
r3203 r3225 407 407 408 408 /** 409 Returns $ws property content. 410 411 @return <b>string</b> 412 */ 413 public function dumpWorkspace() 414 { 415 return $this->ws; 416 } 417 418 /** 409 419 Returns $prefs property content. 410 420 -
inc/dbschema/db-schema.php
r2566 r3231 19 19 -------------------------------------------------------- */ 20 20 $_s->blog 21 ->blog_id ('varchar', 32,false)22 ->blog_uid ('varchar', 32,false)23 ->blog_creadt ('timestamp', 0,false, 'now()')24 ->blog_upddt ('timestamp', 0,false, 'now()')25 ->blog_url ('varchar',255, false)26 ->blog_name ('varchar',255, false)27 ->blog_desc ('text', 0,true)28 ->blog_status ('smallint', 0,false, 1)21 ->blog_id ('varchar', 32, false) 22 ->blog_uid ('varchar', 32, false) 23 ->blog_creadt ('timestamp', 0, false, 'now()') 24 ->blog_upddt ('timestamp', 0, false, 'now()') 25 ->blog_url ('varchar', 255, false) 26 ->blog_name ('varchar', 255, false) 27 ->blog_desc ('text', 0, true) 28 ->blog_status ('smallint', 0, false, 1) 29 29 30 30 ->primary('pk_blog','blog_id') … … 32 32 33 33 $_s->category 34 ->cat_id ('bigint', 0,false)35 ->blog_id ('varchar', 32,false)36 ->cat_title ('varchar',255, false)37 ->cat_url ('varchar',255, false)38 ->cat_desc ('text', 0,true)39 ->cat_position ('integer', 0,true, 0)40 ->cat_lft ('integer', 0,true)41 ->cat_rgt ('integer', 0,true)34 ->cat_id ('bigint', 0, false) 35 ->blog_id ('varchar', 32, false) 36 ->cat_title ('varchar', 255, false) 37 ->cat_url ('varchar', 255, false) 38 ->cat_desc ('text', 0, true) 39 ->cat_position ('integer', 0, true, 0) 40 ->cat_lft ('integer', 0, true) 41 ->cat_rgt ('integer', 0, true) 42 42 43 43 ->primary('pk_category','cat_id') … … 47 47 48 48 $_s->session 49 ->ses_id ('varchar', 40,false)50 ->ses_time ('integer', 0,false, 0)51 ->ses_start ('integer', 0,false, 0)52 ->ses_value ('text', 0,false)49 ->ses_id ('varchar', 40, false) 50 ->ses_time ('integer', 0, false, 0) 51 ->ses_start ('integer', 0, false, 0) 52 ->ses_value ('text', 0, false) 53 53 54 54 ->primary('pk_session','ses_id') … … 56 56 57 57 $_s->setting 58 ->setting_id ('varchar',255, false)59 ->blog_id ('varchar', 32,true)60 ->setting_ns ('varchar', 32,false, "'system'")61 ->setting_value ('text', 0,true, null)62 ->setting_type ('varchar', 8,false, "'string'")63 ->setting_label ('text', 0,true)58 ->setting_id ('varchar', 255, false) 59 ->blog_id ('varchar', 32, true) 60 ->setting_ns ('varchar', 32, false, "'system'") 61 ->setting_value ('text', 0, true, null) 62 ->setting_type ('varchar', 8, false, "'string'") 63 ->setting_label ('text', 0, true) 64 64 65 65 ->unique('uk_setting','setting_ns','setting_id','blog_id') … … 67 67 68 68 $_s->user 69 ->user_id ('varchar', 32,false)70 ->user_super ('smallint', 0,true)71 ->user_status ('smallint', 0,false, 1)72 ->user_pwd ('varchar', 40, false)73 ->user_change_pwd ('smallint', 0,false, 0)74 ->user_recover_key ('varchar', 32,true, null)75 ->user_name ('varchar',255, true, null)76 ->user_firstname ('varchar',255, true, null)77 ->user_displayname ('varchar',255, true, null)78 ->user_email ('varchar',255, true, null)79 ->user_url ('varchar',255, true, null)80 ->user_desc ('text', 0,true)81 ->user_default_blog ('varchar', 32,true, null)82 ->user_options ('text', 0,true)83 ->user_lang ('varchar', 5,true, null)84 ->user_tz ('varchar',128, false, "'UTC'")85 ->user_post_status ('smallint', 0,false, -2)86 ->user_creadt ('timestamp', 0,false, 'now()')87 ->user_upddt ('timestamp', 0,false, 'now()')69 ->user_id ('varchar', 32, false) 70 ->user_super ('smallint', 0, true) 71 ->user_status ('smallint', 0, false, 1) 72 ->user_pwd ('varchar', 255, false) 73 ->user_change_pwd ('smallint', 0, false, 0) 74 ->user_recover_key ('varchar', 32, true, null) 75 ->user_name ('varchar', 255, true, null) 76 ->user_firstname ('varchar', 255, true, null) 77 ->user_displayname ('varchar', 255, true, null) 78 ->user_email ('varchar', 255, true, null) 79 ->user_url ('varchar', 255, true, null) 80 ->user_desc ('text', 0, true) 81 ->user_default_blog ('varchar', 32, true, null) 82 ->user_options ('text', 0, true) 83 ->user_lang ('varchar', 5, true, null) 84 ->user_tz ('varchar', 128, false, "'UTC'") 85 ->user_post_status ('smallint', 0, false, -2) 86 ->user_creadt ('timestamp', 0, false, 'now()') 87 ->user_upddt ('timestamp', 0, false, 'now()') 88 88 89 89 ->primary('pk_user','user_id') … … 91 91 92 92 $_s->permissions 93 ->user_id ('varchar', 32,false)94 ->blog_id ('varchar', 32,false)95 ->permissions ('text', 0,true)93 ->user_id ('varchar', 32, false) 94 ->blog_id ('varchar', 32, false) 95 ->permissions ('text', 0, true) 96 96 97 97 ->primary('pk_permissions','user_id','blog_id') … … 99 99 100 100 $_s->post 101 ->post_id ('bigint', 0,false)102 ->blog_id ('varchar', 32,false)103 ->user_id ('varchar', 32,false)104 ->cat_id ('bigint', 0,true)105 ->post_dt ('timestamp', 0, false, 'now()')106 ->post_tz ('varchar', 128, false, "'UTC'")107 ->post_creadt ('timestamp', 0, false, 'now()')108 ->post_upddt ('timestamp', 0, false, 'now()')109 ->post_password ('varchar', 32,true, null)110 ->post_type ('varchar', 32,false, "'post'")111 ->post_format ('varchar', 32,false, "'xhtml'")112 ->post_url ('varchar',255, false)113 ->post_lang ('varchar', 5,true, null)114 ->post_title ('varchar', 255, true, null)115 ->post_excerpt ('text', 0, true, null)116 ->post_excerpt_xhtml ('text', 0, true, null)117 ->post_content ('text', 0, true, null)118 ->post_content_xhtml ('text', 0, false)119 ->post_notes ('text', 0, true, null)120 ->post_meta ('text', 0,true, null)121 ->post_words ('text', 0, true, null)122 ->post_status ('smallint', 0, false, 0)123 ->post_selected ('smallint', 0,false, 0)124 ->post_position ('integer', 0,false, 0)125 ->post_open_comment ('smallint', 0, false, 0)126 ->post_open_tb ('smallint', 0, false, 0)127 ->nb_comment ('integer', 0,false, 0)128 ->nb_trackback ('integer', 0,false, 0)101 ->post_id ('bigint', 0, false) 102 ->blog_id ('varchar', 32, false) 103 ->user_id ('varchar', 32, false) 104 ->cat_id ('bigint', 0, true) 105 ->post_dt ('timestamp', 0, false, 'now()') 106 ->post_tz ('varchar', 128, false, "'UTC'") 107 ->post_creadt ('timestamp', 0, false, 'now()') 108 ->post_upddt ('timestamp', 0, false, 'now()') 109 ->post_password ('varchar', 32, true, null) 110 ->post_type ('varchar', 32, false, "'post'") 111 ->post_format ('varchar', 32, false, "'xhtml'") 112 ->post_url ('varchar', 255, false) 113 ->post_lang ('varchar', 5, true, null) 114 ->post_title ('varchar', 255, true, null) 115 ->post_excerpt ('text', 0, true, null) 116 ->post_excerpt_xhtml ('text', 0, true, null) 117 ->post_content ('text', 0, true, null) 118 ->post_content_xhtml ('text', 0, false) 119 ->post_notes ('text', 0, true, null) 120 ->post_meta ('text', 0, true, null) 121 ->post_words ('text', 0, true, null) 122 ->post_status ('smallint', 0, false, 0) 123 ->post_selected ('smallint', 0, false, 0) 124 ->post_position ('integer', 0, false, 0) 125 ->post_open_comment ('smallint', 0, false, 0) 126 ->post_open_tb ('smallint', 0, false, 0) 127 ->nb_comment ('integer', 0, false, 0) 128 ->nb_trackback ('integer', 0, false, 0) 129 129 130 130 ->primary('pk_post','post_id') … … 134 134 135 135 $_s->media 136 ->media_id ('bigint', 0,false)137 ->user_id ('varchar', 32,false)138 ->media_path ('varchar',255, false)139 ->media_title ('varchar',255, false)140 ->media_file ('varchar',255, false)141 ->media_dir ('varchar',255, false, "'.'")142 ->media_meta ('text', 0,true, null)143 ->media_dt ('timestamp', 0,false, 'now()')144 ->media_creadt ('timestamp', 0,false, 'now()')145 ->media_upddt ('timestamp', 0,false, 'now()')146 ->media_private ('smallint', 0,false, 0)136 ->media_id ('bigint', 0, false) 137 ->user_id ('varchar', 32, false) 138 ->media_path ('varchar', 255, false) 139 ->media_title ('varchar', 255, false) 140 ->media_file ('varchar', 255, false) 141 ->media_dir ('varchar', 255, false, "'.'") 142 ->media_meta ('text', 0, true, null) 143 ->media_dt ('timestamp', 0, false, 'now()') 144 ->media_creadt ('timestamp', 0, false, 'now()') 145 ->media_upddt ('timestamp', 0, false, 'now()') 146 ->media_private ('smallint', 0, false, 0) 147 147 148 148 ->primary('pk_media','media_id') … … 150 150 151 151 $_s->post_media 152 ->media_id ('bigint', 0,false)153 ->post_id ('bigint', 0,false)154 ->link_type ('varchar', 32,false, "'attachment'")152 ->media_id ('bigint', 0, false) 153 ->post_id ('bigint', 0, false) 154 ->link_type ('varchar', 32, false, "'attachment'") 155 155 156 156 ->primary('pk_post_media','media_id','post_id','link_type') … … 158 158 159 159 $_s->log 160 ->log_id ('bigint', 0,false)161 ->user_id ('varchar', 32,true)162 ->blog_id ('varchar', 32,true)163 ->log_table ('varchar',255, false)164 ->log_dt ('timestamp', 0,false, 'now()')165 ->log_ip ('varchar', 39,false)166 ->log_msg ('text', 0,true, null)160 ->log_id ('bigint', 0, false) 161 ->user_id ('varchar', 32, true) 162 ->blog_id ('varchar', 32, true) 163 ->log_table ('varchar', 255, false) 164 ->log_dt ('timestamp', 0, false, 'now()') 165 ->log_ip ('varchar', 39, false) 166 ->log_msg ('text', 0, true, null) 167 167 168 168 ->primary('pk_log','log_id') … … 170 170 171 171 $_s->version 172 ->module ('varchar', 64,false)173 ->version ('varchar', 32,false)172 ->module ('varchar', 64, false) 173 ->version ('varchar', 32, false) 174 174 175 175 ->primary('pk_version','module') … … 177 177 178 178 $_s->ping 179 ->post_id ('bigint', 0,false)180 ->ping_url ('varchar',255, false)181 ->ping_dt ('timestamp', 0,false, 'now()')179 ->post_id ('bigint', 0, false) 180 ->ping_url ('varchar', 255, false) 181 ->ping_dt ('timestamp', 0, false, 'now()') 182 182 183 183 ->primary('pk_ping','post_id','ping_url') … … 185 185 186 186 $_s->comment 187 ->comment_id ('bigint', 0,false)188 ->post_id ('bigint', 0,false)189 ->comment_dt ('timestamp', 0, false, 'now()')190 ->comment_tz ('varchar', 128, false, "'UTC'")191 ->comment_upddt ('timestamp', 0,false, 'now()')192 ->comment_author ('varchar', 255, true, null)193 ->comment_email ('varchar',255, true, null)194 ->comment_site ('varchar', 255, true, null)195 ->comment_content ('text', 0, true)196 ->comment_words ('text', 0,true, null)197 ->comment_ip ('varchar', 39,true, null)198 ->comment_status ('smallint', 0, true, 0)199 ->comment_spam_status ('varchar', 128, true, 0)200 ->comment_spam_filter ('varchar', 32,true, null)201 ->comment_trackback ('smallint', 0, false, 0)187 ->comment_id ('bigint', 0, false) 188 ->post_id ('bigint', 0, false) 189 ->comment_dt ('timestamp', 0, false, 'now()') 190 ->comment_tz ('varchar', 128, false, "'UTC'") 191 ->comment_upddt ('timestamp', 0, false, 'now()') 192 ->comment_author ('varchar', 255, true, null) 193 ->comment_email ('varchar', 255, true, null) 194 ->comment_site ('varchar', 255, true, null) 195 ->comment_content ('text', 0, true) 196 ->comment_words ('text', 0, true, null) 197 ->comment_ip ('varchar', 39, true, null) 198 ->comment_status ('smallint', 0, true, 0) 199 ->comment_spam_status ('varchar', 128, true, 0) 200 ->comment_spam_filter ('varchar', 32, true, null) 201 ->comment_trackback ('smallint', 0, false, 0) 202 202 203 203 ->primary('pk_comment','comment_id') … … 205 205 206 206 $_s->meta 207 ->meta_id ('varchar',255, false)208 ->meta_type ('varchar', 64,false)209 ->post_id ('bigint', 0,false)207 ->meta_id ('varchar', 255, false) 208 ->meta_type ('varchar', 64, false) 209 ->post_id ('bigint', 0, false) 210 210 211 211 ->primary('pk_meta','meta_id','meta_type','post_id') … … 213 213 214 214 $_s->pref 215 ->pref_id ('varchar',255, false)216 ->user_id ('varchar', 32,true)217 ->pref_ws ('varchar', 32,false, "'system'")218 ->pref_value ('text', 0,true, null)219 ->pref_type ('varchar', 8,false, "'string'")220 ->pref_label ('text', 0,true)215 ->pref_id ('varchar', 255, false) 216 ->user_id ('varchar', 32, true) 217 ->pref_ws ('varchar', 32, false, "'system'") 218 ->pref_value ('text', 0, true, null) 219 ->pref_type ('varchar', 8, false, "'string'") 220 ->pref_label ('text', 0, true) 221 221 222 222 ->unique('uk_pref','pref_ws','pref_id','user_id') … … 228 228 $_s->category->index ('idx_category_cat_lft_blog_id', 'btree', 'blog_id', 'cat_lft'); 229 229 $_s->category->index ('idx_category_cat_rgt_blog_id', 'btree', 'blog_id', 'cat_rgt'); 230 $_s->setting->index ('idx_setting_blog_id', 'btree', 'blog_id');231 $_s->user->index ('idx_user_user_default_blog', 'btree', 'user_default_blog');232 $_s->permissions->index ('idx_permissions_blog_id', 'btree', 'blog_id');233 $_s->post->index ('idx_post_cat_id', 'btree', 'cat_id');234 $_s->post->index ('idx_post_user_id', 'btree', 'user_id');235 $_s->post->index ('idx_post_blog_id', 'btree', 'blog_id');236 $_s->media->index ('idx_media_user_id', 'btree', 'user_id');237 $_s->post_media->index ('idx_post_media_post_id', 'btree', 'post_id');238 $_s->post_media->index ('idx_post_media_media_id', 'btree', 'media_id');239 $_s->log->index ('idx_log_user_id','btree', 'user_id');240 $_s->comment->index ('idx_comment_post_id', 'btree', 'post_id');241 $_s->meta->index ('idx_meta_post_id', 'btree','post_id');242 $_s->meta->index ('idx_meta_meta_type', 'btree','meta_type');243 $_s->pref->index ('idx_pref_user_id', 'btree', 'user_id');230 $_s->setting->index ('idx_setting_blog_id', 'btree', 'blog_id'); 231 $_s->user->index ('idx_user_user_default_blog', 'btree', 'user_default_blog'); 232 $_s->permissions->index ('idx_permissions_blog_id', 'btree', 'blog_id'); 233 $_s->post->index ('idx_post_cat_id', 'btree', 'cat_id'); 234 $_s->post->index ('idx_post_user_id', 'btree', 'user_id'); 235 $_s->post->index ('idx_post_blog_id', 'btree', 'blog_id'); 236 $_s->media->index ('idx_media_user_id', 'btree', 'user_id'); 237 $_s->post_media->index ('idx_post_media_post_id', 'btree', 'post_id'); 238 $_s->post_media->index ('idx_post_media_media_id', 'btree', 'media_id'); 239 $_s->log->index ('idx_log_user_id', 'btree', 'user_id'); 240 $_s->comment->index ('idx_comment_post_id', 'btree', 'post_id'); 241 $_s->meta->index ('idx_meta_post_id', 'btree', 'post_id'); 242 $_s->meta->index ('idx_meta_meta_type', 'btree', 'meta_type'); 243 $_s->pref->index ('idx_pref_user_id', 'btree', 'user_id'); 244 244 245 245 /* Performance indexes 246 246 -------------------------------------------------------- */ 247 247 $_s->comment->index ('idx_comment_post_id_dt_status', 'btree', 'post_id', 'comment_dt', 'comment_status'); 248 $_s->post->index ('idx_post_post_dt', 'btree', 'post_dt');249 $_s->post->index ('idx_post_post_dt_post_id', 'btree', 'post_dt', 'post_id');250 $_s->post->index ('idx_blog_post_post_dt_post_id', 'btree', 'blog_id', 'post_dt','post_id');251 $_s->post->index ('idx_blog_post_post_status', 'btree', 'blog_id', 'post_status');252 $_s->blog->index ('idx_blog_blog_upddt', 'btree', 'blog_upddt');253 $_s->user->index ('idx_user_user_super', 'btree', 'user_super');248 $_s->post->index ('idx_post_post_dt', 'btree', 'post_dt'); 249 $_s->post->index ('idx_post_post_dt_post_id', 'btree', 'post_dt', 'post_id'); 250 $_s->post->index ('idx_blog_post_post_dt_post_id', 'btree', 'blog_id', 'post_dt', 'post_id'); 251 $_s->post->index ('idx_blog_post_post_status', 'btree', 'blog_id', 'post_status'); 252 $_s->blog->index ('idx_blog_blog_upddt', 'btree', 'blog_upddt'); 253 $_s->user->index ('idx_user_user_super', 'btree', 'user_super'); 254 254 255 255 /* Foreign keys -
inc/dbschema/upgrade.php
r3232 r3237 540 540 } 541 541 542 if (version_compare($version,'2.10','<=')) 543 { 544 @unlink(DC_ROOT.'/'.'admin/js/jsUpload/vendor/jquery.ui.widget.js'); 545 @rmdir(DC_ROOT.'/'.'admin/js/jsUpload/vendor'); 546 } 547 542 548 $core->setVersion('core',DC_VERSION); 543 549 $core->blogDefaults(); -
inc/prepend.php
r3235 r3237 142 142 # Constants 143 143 define('DC_ROOT',path::real(dirname(__FILE__).'/..')); 144 define('DC_VERSION','2. 9.1');144 define('DC_VERSION','2.10-dev'); 145 145 define('DC_DIGESTS',dirname(__FILE__).'/digests'); 146 146 define('DC_L10N_ROOT',dirname(__FILE__).'/../locales'); … … 189 189 if (!defined('DC_ALLOW_MULTI_MODULES')) { 190 190 define('DC_ALLOW_MULTI_MODULES',false); 191 } 192 193 if (!defined('DC_CRYPT_ALGO')) { 194 define('DC_CRYPT_ALGO','sha1'); // As in Dotclear 2.9 and previous 195 } else { 196 // Check length of cryptographic algorithm result and exit if less than 40 characters long 197 if (strlen(crypt::hmac(DC_MASTER_KEY,DC_VENDOR_NAME,DC_CRYPT_ALGO)) < 40) { 198 if (!defined('DC_CONTEXT_ADMIN')) { 199 exit('Site temporarily unavailable'); 200 } else { 201 exit(DC_CRYPT_ALGO.' cryptographic algorithm configured is not strong enough, please change it.'); 202 } 203 } 191 204 } 192 205 -
inc/public/default-templates/currywurst/__layout.html
r3017 r3226 15 15 </tpl:Block> <!-- meta-robots --> 16 16 <tpl:Block name="meta-entry"> 17 <meta name="description" lang="{{tpl:BlogLanguage}}" content="{{tpl:BlogDescription cut_string="180" encode_html="1"}}<tpl:PaginationIf start="0"> - {{tpl:lang page}} {{tpl:PaginationCurrent}}</tpl:PaginationIf>" />17 <meta name="description" lang="{{tpl:BlogLanguage}}" content="{{tpl:BlogDescription cut_string="180" remove_html="1" encode_html="1"}}<tpl:PaginationIf start="0"> - {{tpl:lang page}} {{tpl:PaginationCurrent}}</tpl:PaginationIf>" /> 18 18 <meta name="author" content="{{tpl:BlogEditor encode_html="1"}}" /> 19 19 <meta name="date" content="{{tpl:BlogUpdateDate iso8601="1"}}" /> … … 29 29 <tpl:Block name="dc-entry"> 30 30 <meta property="dc.title" lang="{{tpl:BlogLanguage}}" content="{{tpl:BlogName encode_html="1"}}<tpl:PaginationIf start="0"> - {{tpl:lang page}} {{tpl:PaginationCurrent}}</tpl:PaginationIf>" /> 31 <meta property="dc.description" lang="{{tpl:BlogLanguage}}" content="{{tpl:BlogDescription encode_html="1"}}" />31 <meta property="dc.description" lang="{{tpl:BlogLanguage}}" content="{{tpl:BlogDescription remove_html="1" encode_html="1"}}" /> 32 32 <meta property="dc.language" content="{{tpl:BlogLanguage}}" /> 33 33 <meta property="dc.date" content="{{tpl:BlogUpdateDate iso8601="1"}}" /> -
inc/public/default-templates/currywurst/archive.html
r2845 r3226 7 7 <tpl:Block name="dc-entry"> 8 8 <meta property="dc.title" lang="{{tpl:BlogLanguage}}" content="{{tpl:lang Archives}} - {{tpl:BlogName encode_html="1"}}" /> 9 <meta property="dc.description" lang="{{tpl:BlogLanguage}}" content="{{tpl:BlogDescription encode_html="1"}}" />9 <meta property="dc.description" lang="{{tpl:BlogLanguage}}" content="{{tpl:BlogDescription remove_html="1" encode_html="1"}}" /> 10 10 <meta property="dc.language" content="{{tpl:BlogLanguage}}" /> 11 11 <meta property="dc.date" content="{{tpl:BlogUpdateDate iso8601="1"}}" /> -
inc/public/default-templates/currywurst/atom-comments.xml
r2600 r3226 7 7 <link href="{{tpl:SysSelfURI}}" rel="self" type="application/atom+xml"/> 8 8 <link href="{{tpl:BlogURL}}" rel="alternate" type="text/html" 9 title="{{tpl:BlogDescription encode_xml="1"}}"/>9 title="{{tpl:BlogDescription remove_html="1" encode_xml="1"}}"/> 10 10 <updated>{{tpl:BlogUpdateDate iso8601="1"}}</updated> 11 11 <author> -
inc/public/default-templates/currywurst/atom.xml
r2600 r3226 9 9 <link href="{{tpl:SysSelfURI}}" rel="self" type="application/atom+xml"/> 10 10 <link href="{{tpl:BlogURL}}" rel="alternate" type="text/html" 11 title="{{tpl:BlogDescription encode_xml="1"}}"/>11 title="{{tpl:BlogDescription remove_html="1" encode_xml="1"}}"/> 12 12 <updated>{{tpl:BlogUpdateDate iso8601="1"}}</updated> 13 13 <author> -
inc/public/default-templates/currywurst/rss2-comments.xml
r2600 r3226 10 10 <link>{{tpl:BlogURL}}</link> 11 11 <atom:link href="{{tpl:SysSelfURI}}" rel="self" type="application/rss+xml"/> 12 <description>{{tpl:BlogDescription encode_xml="1"}}</description>12 <description>{{tpl:BlogDescription remove_html="1" encode_xml="1"}}</description> 13 13 <language>{{tpl:BlogLanguage}}</language> 14 14 <pubDate>{{tpl:BlogUpdateDate rfc822="1"}}</pubDate> -
inc/public/default-templates/currywurst/rss2.xml
r2600 r3226 10 10 <link>{{tpl:BlogURL}}</link> 11 11 <atom:link href="{{tpl:SysSelfURI}}" rel="self" type="application/rss+xml"/> 12 <description>{{tpl:BlogDescription encode_xml="1"}}</description>12 <description>{{tpl:BlogDescription remove_html="1" encode_xml="1"}}</description> 13 13 <language>{{tpl:BlogLanguage}}</language> 14 14 <pubDate>{{tpl:BlogUpdateDate rfc822="1"}}</pubDate> -
inc/public/default-templates/currywurst/search.html
r3042 r3226 11 11 <tpl:Block name="dc-entry"> 12 12 <meta property="dc.title" lang="{{tpl:BlogLanguage}}" content="{{tpl:lang Search}} - {{tpl:SysSearchString encode_html="1"}} - {{tpl:BlogName encode_html="1"}}<tpl:PaginationIf start="0"> - {{tpl:lang page}} {{tpl:PaginationCurrent}}</tpl:PaginationIf>" /> 13 <meta property="dc.description" lang="{{tpl:BlogLanguage}}" content="{{tpl:BlogDescription encode_html="1"}}" />13 <meta property="dc.description" lang="{{tpl:BlogLanguage}}" content="{{tpl:BlogDescription remove_html="1" encode_html="1"}}" /> 14 14 <meta property="dc.language" content="{{tpl:BlogLanguage}}" /> 15 15 <meta property="dc.date" content="{{tpl:BlogUpdateDate iso8601="1"}}" /> -
inc/public/default-templates/mustek/__layout.html
r3061 r3226 15 15 </tpl:Block> <!-- meta-robots --> 16 16 <tpl:Block name="meta-entry"> 17 <meta name="description" lang="{{tpl:BlogLanguage}}" content="{{tpl:BlogDescription cut_string="180" encode_html="1"}}<tpl:PaginationIf start="0"> - {{tpl:lang page}} {{tpl:PaginationCurrent}}</tpl:PaginationIf>" />17 <meta name="description" lang="{{tpl:BlogLanguage}}" content="{{tpl:BlogDescription cut_string="180" remove_html="1" encode_html="1"}}<tpl:PaginationIf start="0"> - {{tpl:lang page}} {{tpl:PaginationCurrent}}</tpl:PaginationIf>" /> 18 18 <meta name="author" content="{{tpl:BlogEditor encode_html="1"}}" /> 19 19 <meta name="date" content="{{tpl:BlogUpdateDate iso8601="1"}}" /> … … 29 29 <tpl:Block name="dc-entry"> 30 30 <meta property="dc.title" lang="{{tpl:BlogLanguage}}" content="{{tpl:BlogName encode_html="1"}}<tpl:PaginationIf start="0"> - {{tpl:lang page}} {{tpl:PaginationCurrent}}</tpl:PaginationIf>" /> 31 <meta property="dc.description" lang="{{tpl:BlogLanguage}}" content="{{tpl:BlogDescription encode_html="1"}}" />31 <meta property="dc.description" lang="{{tpl:BlogLanguage}}" content="{{tpl:BlogDescription remove_html="1" encode_html="1"}}" /> 32 32 <meta property="dc.language" content="{{tpl:BlogLanguage}}" /> 33 33 <meta property="dc.date" content="{{tpl:BlogUpdateDate iso8601="1"}}" /> -
inc/public/default-templates/mustek/atom-comments.xml
r2599 r3226 7 7 <link href="{{tpl:SysSelfURI}}" rel="self" type="application/atom+xml"/> 8 8 <link href="{{tpl:BlogURL}}" rel="alternate" type="text/html" 9 title="{{tpl:BlogDescription encode_xml="1"}}"/>9 title="{{tpl:BlogDescription remove_html="1" encode_xml="1"}}"/> 10 10 <updated>{{tpl:BlogUpdateDate iso8601="1"}}</updated> 11 11 <author> -
inc/public/default-templates/mustek/atom.xml
r2599 r3226 9 9 <link href="{{tpl:SysSelfURI}}" rel="self" type="application/atom+xml"/> 10 10 <link href="{{tpl:BlogURL}}" rel="alternate" type="text/html" 11 title="{{tpl:BlogDescription encode_xml="1"}}"/>11 title="{{tpl:BlogDescription remove_html="1" encode_xml="1"}}"/> 12 12 <updated>{{tpl:BlogUpdateDate iso8601="1"}}</updated> 13 13 <author> -
inc/public/default-templates/mustek/rss2-comments.xml
r2599 r3226 10 10 <link>{{tpl:BlogURL}}</link> 11 11 <atom:link href="{{tpl:SysSelfURI}}" rel="self" type="application/rss+xml"/> 12 <description>{{tpl:BlogDescription encode_xml="1"}}</description>12 <description>{{tpl:BlogDescription remove_html="1" encode_xml="1"}}</description> 13 13 <language>{{tpl:BlogLanguage}}</language> 14 14 <pubDate>{{tpl:BlogUpdateDate rfc822="1"}}</pubDate> -
inc/public/default-templates/mustek/rss2.xml
r2599 r3226 10 10 <link>{{tpl:BlogURL}}</link> 11 11 <atom:link href="{{tpl:SysSelfURI}}" rel="self" type="application/rss+xml"/> 12 <description>{{tpl:BlogDescription encode_xml="1"}}</description>12 <description>{{tpl:BlogDescription remove_html="1" encode_xml="1"}}</description> 13 13 <language>{{tpl:BlogLanguage}}</language> 14 14 <pubDate>{{tpl:BlogUpdateDate rfc822="1"}}</pubDate> -
locales/en/main.po
r2807 r3210 666 666 msgstr "" 667 667 668 msgid "Category where to move posts does not exist"668 msgid "Category where to move entries does not exist" 669 669 msgstr "" 670 670 -
locales/fr/main.po
r3204 r3210 708 708 709 709 msgid "Entries have been successfully moved to the category you choose." 710 msgstr "Les billets ont été déplacés dans la catégorie choisie."710 msgstr "Les entrées ont été déplacés dans la catégorie choisie." 711 711 712 712 msgid "New category" … … 718 718 #, php-format 719 719 msgid "%d entries" 720 msgstr "%d billets"720 msgstr "%d entrées" 721 721 722 722 #, php-format 723 723 msgid "%d entry" 724 724 msgid_plural "%d entries" 725 msgstr[0] "%d billet"726 msgstr[1] "%d billets"725 msgstr[0] "%d entrée" 726 msgstr[1] "%d entrées" 727 727 728 728 msgid "total:" … … 733 733 734 734 msgid "Move entries to" 735 msgstr "Déplacer les billets vers"735 msgstr "Déplacer les entrées vers" 736 736 737 737 msgid "OK" … … 803 803 804 804 msgid "Entry does not exist." 805 msgstr "Ce billetn'existe pas."805 msgstr "Cette entrée n'existe pas." 806 806 807 807 msgid "Comment has been successfully created." -
plugins/.htaccess
r0 r3220 1 Require all denied 1 2 Deny from all -
plugins/antispam/inc/lib.dc.antispam.php
r3036 r3231 143 143 144 144 $user_id = trim(@pack('a32',substr($code,0,32))); 145 $pwd = @unpack('H 40hex',substr($code,32,40));145 $pwd = @unpack('H*hex',substr($code,32)); 146 146 147 147 if ($user_id === false || $pwd === false) { -
plugins/widgets/class.widgets.php
r3058 r3223 320 320 $res .= 321 321 '<p><label for="'.$wfid.'">'.$s['title'].'</label> '. 322 form::textarea(array($iname,$wfid),30, 5,html::escapeHTML($s['value']),'maximal').322 form::textarea(array($iname,$wfid),30,8,html::escapeHTML($s['value']),'maximal'). 323 323 '</p>'; 324 324 break; -
plugins/widgets/index.php
r3021 r3223 234 234 //]]> 235 235 </script> 236 <?php echo $core->callBehavior('adminPostEditor');?> 236 <?php 237 $widget_editor = $core->auth->getOption('editor'); 238 echo $core->callBehavior('adminPostEditor',$widget_editor['xhtml'],'widget',array('#sidebarsWidgets textarea'),'xhtml'); 239 ?> 237 240 <?php echo(dcPage::jsConfirmClose('sidebarsWidgets')); ?> 238 241 </head> -
plugins/widgets/widgets.js
r2563 r3223 126 126 reorder($this.parents('ul.connected')); 127 127 }); 128 129 // HTML text editor 130 if ($.isFunction(jsToolBar)) { 131 $('#sidebarsWidgets textarea').each(function() { 132 var tbWidgetText = new jsToolBar(this); 133 tbWidgetText.draw('xhtml'); 134 }); 135 } 136 128 137 }); -
tests/functional/index.html
r2726 r3218 16 16 <script type="text/javascript" src="../../admin/js/_users_actions.js"></script> 17 17 <script type="text/javascript" src="../../admin/js/common.js"></script> 18 <script type="text/javascript" src="../../admin/js/jquery/jquery.pageTabs.js"></script> 19 18 <script type="text/javascript" src="../../admin/js/jquery/jquery.pageTabs.js"></script> 19 20 20 <!--[if lt IE 8]> 21 21 <script type="text/javascript" src="js/ie7/ie7-hashchange.js"></script> … … 27 27 28 28 <!-- jsUpload --> 29 <script type="text/javascript" src="../../admin/js/j sUpload/vendor/jquery.ui.widget.js"></script>29 <script type="text/javascript" src="../../admin/js/jquery/jquery-ui.custom.js"></script> 30 30 <script type="text/javascript" src="../../admin/js/jsUpload/tmpl.js"></script> 31 31 <script type="text/javascript" src="../../admin/js/jsUpload/template-upload.js"></script> … … 35 35 <script type="text/javascript" src="../../admin/js/jsUpload/jquery.fileupload.js"></script> 36 36 <script type="text/javascript" src="../../admin/js/jsUpload/jquery.fileupload-process.js"></script> 37 <script type="text/javascript" src="../../admin/js/jsUpload/jquery.fileupload-resize.js"></script> 37 <script type="text/javascript" src="../../admin/js/jsUpload/jquery.fileupload-resize.js"></script> 38 38 <script type="text/javascript" src="../../admin/js/jsUpload/jquery.fileupload-ui.js"></script> 39 39 <script type="text/javascript" src="../../admin/js/_media.js"></script> 40 40 41 41 <!-- <script type="text/javascript" src="spec/users_actions.js"></script> --> 42 42 <script type="text/javascript" src="spec/toggle_with_legend.js"></script> 43 43 <script type="text/javascript" src="spec/common.js"></script> 44 44 <script type="text/javascript" src="spec/media_manager.js"></script> 45 45 46 46 <!-- page tabs --> 47 47 <script type="text/javascript" src="spec/page_tabs.js"></script> 48 48 49 49 </head> 50 50 <body> -
themes/berlin/scss/partials/_sidebar.scss
r3019 r3211 64 64 li li { 65 65 border-top: 1px solid $gray-medium; 66 }67 li li:last-child {68 66 border-bottom: none; 69 67 } -
themes/berlin/style.css
r3019 r3211 247 247 a:focus { 248 248 background-color: #d52125; 249 color: #f 9f9f9; }249 color: #fafafa; } 250 250 251 251 hr { … … 253 253 height: 1px; 254 254 background: #333; 255 background-image: url('data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0idXRmLTgiPz4gPHN2ZyB2ZXJzaW9uPSIxLjEiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyI+PGRlZnM+PGxpbmVhckdyYWRpZW50IGlkPSJncmFkIiBncmFkaWVudFVuaXRzPSJvYmplY3RCb3VuZGluZ0JveCIgeDE9IjAuMCIgeTE9IjAuNSIgeDI9IjEuMCIgeTI9IjAuNSI+PHN0b3Agb2Zmc2V0PSIwJSIgc3RvcC1jb2xvcj0iI2RjZGNkYyIvPjxzdG9wIG9mZnNldD0iNTAlIiBzdG9wLWNvbG9yPSIjNj I2MjYyIi8+PHN0b3Agb2Zmc2V0PSIxMDAlIiBzdG9wLWNvbG9yPSIjZGNkY2RjIi8+PC9saW5lYXJHcmFkaWVudD48L2RlZnM+PHJlY3QgeD0iMCIgeT0iMCIgd2lkdGg9IjEwMCUiIGhlaWdodD0iMTAwJSIgZmlsbD0idXJsKCNncmFkKSIgLz48L3N2Zz4g');255 background-image: url('data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0idXRmLTgiPz4gPHN2ZyB2ZXJzaW9uPSIxLjEiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyI+PGRlZnM+PGxpbmVhckdyYWRpZW50IGlkPSJncmFkIiBncmFkaWVudFVuaXRzPSJvYmplY3RCb3VuZGluZ0JveCIgeDE9IjAuMCIgeTE9IjAuNSIgeDI9IjEuMCIgeTI9IjAuNSI+PHN0b3Agb2Zmc2V0PSIwJSIgc3RvcC1jb2xvcj0iI2RjZGNkYyIvPjxzdG9wIG9mZnNldD0iNTAlIiBzdG9wLWNvbG9yPSIjNjM2MzYzIi8+PHN0b3Agb2Zmc2V0PSIxMDAlIiBzdG9wLWNvbG9yPSIjZGNkY2RjIi8+PC9saW5lYXJHcmFkaWVudD48L2RlZnM+PHJlY3QgeD0iMCIgeT0iMCIgd2lkdGg9IjEwMCUiIGhlaWdodD0iMTAwJSIgZmlsbD0idXJsKCNncmFkKSIgLz48L3N2Zz4g'); 256 256 background-size: 100%; 257 background-image: linear-gradient(to right, #dcdcdc, #6 26262, #dcdcdc); }257 background-image: linear-gradient(to right, #dcdcdc, #636363, #dcdcdc); } 258 258 259 259 blockquote, q { 260 260 font-family: "New Century Schoolbook", "Century Schoolbook", "Century Schoolbook L", Georgia, serif; 261 color: #6 26262;261 color: #636363; 262 262 font-style: italic; } 263 263 … … 360 360 --------------------------------------------------- */ 361 361 body { 362 background: #f 2f2f2url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAADAAAAAwCAAAAAByaaZbAAADdUlEQVR4AZWVPc6YyQ2D3/sfdij+SW2ABYwt4nyxu6mIkfSQ/Oo7iNxJRhvoIANUPEBWnL55o+1w9F0eXA2eo3GnmRwKpOvGrxan6mTbftJgg1m+cgoT9QjltgtqrprlaBfHfNMG232drOVTx5hpUlghlLIT3Tz5fW1EU5hNrh1nB1QeNkhihaTIVuP7WA6xWLCcw+3IEkdWhX9UJQBSZ+GPFcq3m4ft5PkN8irxmT5ImjWfQ73BR2n2FKJlMzvSVuNa4nBpwjjNxLA/bOjF4eLNNm9Xu8LtdBGlldB6qEd8013DDHGe7NYcjltZLaei33KBDb3frrQuo0RFVU2HyGVjLhsvZOqBOX2/1frhm98f73NEt/p0V60wyCSj4ZLIzWI1MdDcwWXT9/Sp0NNmYgjDtN4Zjqz1s9gMZ7Z6bfXt4+R1X6xXR2TWECjPzc2aiLd5Wsnf3szcQUt5ll0uqk0wS0Ijtk8EQZpfIjja7Iads6eT5e6A4SL3lFw92C6/6WKS9dNtFe9ef3DV5xmHvmCB8KAiGU/dyZo6sTWzx9v3jWr7FPphVGa8Os+UNdLJkLd1eL77+LqUZKYzqZwQ5mSxe+YLgjOrcbCfzFrKm9cZGk/VsrW9qzvMaIfYXRr41m4nHh2rl7O9Qw4vtzTKzJCO8iR+PYsT2rykGnkW2nqE/W8Ovg4wayyj5SAg8wPzH2xSR3Vxdh5DjdnZ8XHPeRNxzo2jDwRnH4GdDLJoNXVuciE2hUggxoTvm3koeJy32v9/xu9F2RamcMJ1ErILDhSF8XFmYw1u5/NhDVymA9NYCIouzuyqCsg9nzMUP27yN4N/8+zOwxtuBKnrXWZ94F7Q4PmWtTfe79ejZndbmXomcwD4RqrbgE9G4W+Rp/Kt9j3rnev9IdK/UfPSxdq+l604yJvhClp5rf6bLV+pZ/FZN1vrUofcg+U4J7Arbkd+e98uUHIKr1Jal2X5v8ryw1PmjQ408WYVYBcctqYXlibH9taTj+s5MG1mhwsau42H7b7pQabPpCbA98eYZlmS349yG3ZQLw8oF3mfekfnmVSFehI4O6PnZxNv+xIDADsfx76H3mbdI01EO2B/i9l3O7sP6liqH71CScT1m4hZxKiqKfiN/y7Kvmkr7+rMmFejcdK9oBA96axnfOHD98sYQbJ/UBb/AYWMh4VaQZTbAAAAAElFTkSuQmCC');362 background: #f3f3f3 url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAADAAAAAwCAAAAAByaaZbAAADdUlEQVR4AZWVPc6YyQ2D3/sfdij+SW2ABYwt4nyxu6mIkfSQ/Oo7iNxJRhvoIANUPEBWnL55o+1w9F0eXA2eo3GnmRwKpOvGrxan6mTbftJgg1m+cgoT9QjltgtqrprlaBfHfNMG232drOVTx5hpUlghlLIT3Tz5fW1EU5hNrh1nB1QeNkhihaTIVuP7WA6xWLCcw+3IEkdWhX9UJQBSZ+GPFcq3m4ft5PkN8irxmT5ImjWfQ73BR2n2FKJlMzvSVuNa4nBpwjjNxLA/bOjF4eLNNm9Xu8LtdBGlldB6qEd8013DDHGe7NYcjltZLaei33KBDb3frrQuo0RFVU2HyGVjLhsvZOqBOX2/1frhm98f73NEt/p0V60wyCSj4ZLIzWI1MdDcwWXT9/Sp0NNmYgjDtN4Zjqz1s9gMZ7Z6bfXt4+R1X6xXR2TWECjPzc2aiLd5Wsnf3szcQUt5ll0uqk0wS0Ijtk8EQZpfIjja7Iads6eT5e6A4SL3lFw92C6/6WKS9dNtFe9ef3DV5xmHvmCB8KAiGU/dyZo6sTWzx9v3jWr7FPphVGa8Os+UNdLJkLd1eL77+LqUZKYzqZwQ5mSxe+YLgjOrcbCfzFrKm9cZGk/VsrW9qzvMaIfYXRr41m4nHh2rl7O9Qw4vtzTKzJCO8iR+PYsT2rykGnkW2nqE/W8Ovg4wayyj5SAg8wPzH2xSR3Vxdh5DjdnZ8XHPeRNxzo2jDwRnH4GdDLJoNXVuciE2hUggxoTvm3koeJy32v9/xu9F2RamcMJ1ErILDhSF8XFmYw1u5/NhDVymA9NYCIouzuyqCsg9nzMUP27yN4N/8+zOwxtuBKnrXWZ94F7Q4PmWtTfe79ejZndbmXomcwD4RqrbgE9G4W+Rp/Kt9j3rnev9IdK/UfPSxdq+l604yJvhClp5rf6bLV+pZ/FZN1vrUofcg+U4J7Arbkd+e98uUHIKr1Jal2X5v8ryw1PmjQ408WYVYBcctqYXlibH9taTj+s5MG1mhwsau42H7b7pQabPpCbA98eYZlmS349yG3ZQLw8oF3mfekfnmVSFehI4O6PnZxNv+xIDADsfx76H3mbdI01EO2B/i9l3O7sP6liqH71CScT1m4hZxKiqKfiN/y7Kvmkr7+rMmFejcdK9oBA96axnfOHD98sYQbJ/UBb/AYWMh4VaQZTbAAAAAElFTkSuQmCC'); 363 363 color: #373737; } 364 364 … … 455 455 .header a:visited { 456 456 color: #373737; 457 border-bottom-color: #f 9f9f9; }457 border-bottom-color: #fafafa; } 458 458 459 459 .header a:hover, … … 481 481 padding-bottom: .5em; } 482 482 .skip-links li a:link, .skip-links li a:visited { 483 color: #6 26262; }483 color: #636363; } 484 484 .skip-links li a:hover, .skip-links li a:focus { 485 background-color: #f 2f2f2;485 background-color: #f3f3f3; 486 486 color: #d52125; } 487 487 … … 497 497 498 498 .site-title__text { 499 color: #6 26262;499 color: #636363; 500 500 color: rgba(120, 120, 120, 0.8); 501 501 font-weight: bold; … … 514 514 margin-top: 0; 515 515 margin-bottom: 0.5em; 516 color: #6 26262; }516 color: #636363; } 517 517 518 518 .header__nav { … … 549 549 .header__nav li a:hover, 550 550 .header__nav li a:focus { 551 background-color: #6 26262; }551 background-color: #636363; } 552 552 553 553 /* Si js est actif, un bouton pour afficher/masquer le menu est créé */ … … 568 568 background-color: #d52125; } 569 569 #hamburger:focus, #hamburger:hover { 570 background-color: #aa1a1 d;570 background-color: #aa1a1e; 571 571 border-color: #d52125; } 572 572 #hamburger.open { … … 652 652 clear: both; } 653 653 .sidebar a:link, .sidebar a:visited { 654 color: #f 9f9f9;654 color: #fafafa; 655 655 border: none; } 656 656 .sidebar a:hover, .sidebar a:focus, .sidebar a:active, … … 714 714 margin-left: -.25em; } 715 715 .blognav__widgets li li, .blogextra__widgets li li { 716 border-top: 1px solid #dcdcdc; } 717 .blognav__widgets li li:last-child, .blogextra__widgets li li:last-child { 716 border-top: 1px solid #dcdcdc; 718 717 border-bottom: none; } 719 718 … … 767 766 border-radius: 50%; 768 767 border: 1px solid #dcdcdc; 769 background-color: #f 2f2f2; }768 background-color: #f3f3f3; } 770 769 .prev:hover, .prev:focus, .next:hover, .next:focus { 771 770 border-width: 3px; } … … 815 814 width: 10em; 816 815 padding: .25em; 817 border: 1px solid #6 26262;816 border: 1px solid #636363; 818 817 border-radius: .25em; 819 818 background-color: #fff; … … 825 824 border: none; 826 825 font-weight: bold; 827 color: #6 26262; }826 color: #636363; } 828 827 829 828 /** … … 843 842 .post-meta { 844 843 font-size: 0.875em; 845 background-color: #f 2f2f2;844 background-color: #f3f3f3; 846 845 border-radius: 0.5714286em; 847 846 padding: 0.5714286em 1.1428571em; … … 929 928 text-transform: uppercase; 930 929 font-weight: bold; 931 color: #6 26262; }930 color: #636363; } 932 931 933 932 .post-attachments-list { … … 944 943 font-size: 1.25em; 945 944 font-weight: bold; 946 color: #6 26262; }945 color: #636363; } 947 946 948 947 .comments-list { … … 1007 1006 1008 1007 #pr { 1009 background-color: #f 2f2f2;1008 background-color: #f3f3f3; 1010 1009 padding: .5em; 1011 1010 border: 2px solid #6c7c7c; … … 1022 1021 1023 1022 button.submit, button.preview { 1024 background-image: url('data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0idXRmLTgiPz4gPHN2ZyB2ZXJzaW9uPSIxLjEiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyI+PGRlZnM+PGxpbmVhckdyYWRpZW50IGlkPSJncmFkIiBncmFkaWVudFVuaXRzPSJvYmplY3RCb3VuZGluZ0JveCIgeDE9IjAuNSIgeTE9IjAuMCIgeDI9IjAuNSIgeTI9IjEuMCI+PHN0b3Agb2Zmc2V0PSIwJSIgc3RvcC1jb2xvcj0iIzc3OGY5N iIvPjxzdG9wIG9mZnNldD0iMTAwJSIgc3RvcC1jb2xvcj0iIzVkNzU3ZCIvPjwvbGluZWFyR3JhZGllbnQ+PC9kZWZzPjxyZWN0IHg9IjAiIHk9IjAiIHdpZHRoPSIxMDAlIiBoZWlnaHQ9IjEwMCUiIGZpbGw9InVybCgjZ3JhZCkiIC8+PC9zdmc+IA==');1023 background-image: url('data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0idXRmLTgiPz4gPHN2ZyB2ZXJzaW9uPSIxLjEiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyI+PGRlZnM+PGxpbmVhckdyYWRpZW50IGlkPSJncmFkIiBncmFkaWVudFVuaXRzPSJvYmplY3RCb3VuZGluZ0JveCIgeDE9IjAuNSIgeTE9IjAuMCIgeDI9IjAuNSIgeTI9IjEuMCI+PHN0b3Agb2Zmc2V0PSIwJSIgc3RvcC1jb2xvcj0iIzc3OGY5NyIvPjxzdG9wIG9mZnNldD0iMTAwJSIgc3RvcC1jb2xvcj0iIzVlNzY3ZCIvPjwvbGluZWFyR3JhZGllbnQ+PC9kZWZzPjxyZWN0IHg9IjAiIHk9IjAiIHdpZHRoPSIxMDAlIiBoZWlnaHQ9IjEwMCUiIGZpbGw9InVybCgjZ3JhZCkiIC8+PC9zdmc+IA=='); 1025 1024 background-size: 100%; 1026 background-image: linear-gradient(to bottom, #778f9 6, #5d757d);1027 box-shadow: inset 0 1px 3px 0 #778f9 6;1028 background-color: #778f9 6;1025 background-image: linear-gradient(to bottom, #778f97, #5e767d); 1026 box-shadow: inset 0 1px 3px 0 #778f97; 1027 background-color: #778f97; 1029 1028 border-radius: .25em; 1030 border: 1px solid #5 d757d;1029 border: 1px solid #5e767d; 1031 1030 display: inline-block; 1032 1031 cursor: pointer; … … 1034 1033 padding: .25em .5em; 1035 1034 text-decoration: none; 1036 text-shadow: 0 -1px 0 #6 26262; }1035 text-shadow: 0 -1px 0 #636363; } 1037 1036 1038 1037 button.submit:hover, … … 1041 1040 button.preview:focus { 1042 1041 cursor: pointer; 1043 background-image: url('data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0idXRmLTgiPz4gPHN2ZyB2ZXJzaW9uPSIxLjEiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyI+PGRlZnM+PGxpbmVhckdyYWRpZW50IGlkPSJncmFkIiBncmFkaWVudFVuaXRzPSJvYmplY3RCb3VuZGluZ0JveCIgeDE9IjAuNSIgeTE9IjAuMCIgeDI9IjAuNSIgeTI9IjEuMCI+PHN0b3Agb2Zmc2V0PSIwJSIgc3RvcC1jb2xvcj0iIzV kNzU3ZCIvPjxzdG9wIG9mZnNldD0iMTAwJSIgc3RvcC1jb2xvcj0iIzVkNzU3ZCIvPjwvbGluZWFyR3JhZGllbnQ+PC9kZWZzPjxyZWN0IHg9IjAiIHk9IjAiIHdpZHRoPSIxMDAlIiBoZWlnaHQ9IjEwMCUiIGZpbGw9InVybCgjZ3JhZCkiIC8+PC9zdmc+IA==');1042 background-image: url('data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0idXRmLTgiPz4gPHN2ZyB2ZXJzaW9uPSIxLjEiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyI+PGRlZnM+PGxpbmVhckdyYWRpZW50IGlkPSJncmFkIiBncmFkaWVudFVuaXRzPSJvYmplY3RCb3VuZGluZ0JveCIgeDE9IjAuNSIgeTE9IjAuMCIgeDI9IjAuNSIgeTI9IjEuMCI+PHN0b3Agb2Zmc2V0PSIwJSIgc3RvcC1jb2xvcj0iIzVlNzY3ZCIvPjxzdG9wIG9mZnNldD0iMTAwJSIgc3RvcC1jb2xvcj0iIzVlNzY3ZCIvPjwvbGluZWFyR3JhZGllbnQ+PC9kZWZzPjxyZWN0IHg9IjAiIHk9IjAiIHdpZHRoPSIxMDAlIiBoZWlnaHQ9IjEwMCUiIGZpbGw9InVybCgjZ3JhZCkiIC8+PC9zdmc+IA=='); 1044 1043 background-size: 100%; 1045 background-image: linear-gradient(#5 d757d, #5d757d);1046 background-color: #5 d757d; }1044 background-image: linear-gradient(#5e767d, #5e767d); 1045 background-color: #5e767d; } 1047 1046 1048 1047 button.submit:active, button.preview:active { … … 1109 1108 color: #373737; } 1110 1109 .arch-block a:focus { 1111 color: #f 9f9f9; }1110 color: #fafafa; } 1112 1111 @media all and (min-width: 30em) { 1113 1112 .arch-block { … … 1279 1278 background-image: url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAQAAAC1+jfqAAAAKElEQVR4AWNocGgAAiDJAIZgAGZBZMBC/4EQJvgfBEEsmMxwUjCqAABlEwNno9+POwAAAABJRU5ErkJggg=='); 1280 1279 background-image: url('data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0idXRmLTgiPz4NCjwhLS0gR2VuZXJhdG9yOiBBZG9iZSBJbGx1c3RyYXRvciAxNS4wLjIsIFNWRyBFeHBvcnQgUGx1Zy1JbiAuIFNWRyBWZXJzaW9uOiA2LjAwIEJ1aWxkIDApICAtLT4NCjwhRE9DVFlQRSBzdmcgUFVCTElDICItLy9XM0MvL0RURCBTVkcgMS4xLy9FTiIgImh0dHA6Ly93d3cudzMub3JnL0dyYXBoaWNzL1NWRy8xLjEvRFREL3N2ZzExLmR0ZCI+DQo8c3ZnIHZlcnNpb249IjEuMSIgeG1sbnM9Imh0dHA6Ly93d3cudzMub3JnLzIwMDAvc3ZnIiB4bWxuczp4bGluaz0iaHR0cDovL3d3dy53My5vcmcvMTk5OS94bGluayIgeD0iMHB4IiB5PSIwcHgiIHdpZHRoPSIxNnB4Ig0KCSBoZWlnaHQ9IjE2cHgiIHZpZXdCb3g9IjAgMCAxNiAxNiIgZW5hYmxlLWJhY2tncm91bmQ9Im5ldyAwIDAgMTYgMTYiIHhtbDpzcGFjZT0icHJlc2VydmUiPg0KPGcgaWQ9IkNhbHF1ZV8xIj4NCgk8Zz4NCgkJPHBhdGggZmlsbD0iIzgwODA4MCIgZD0iTTAsMGgzdjE2SDBWMHogTTYuNSwwaDN2MTZoLTNWMHogTTEzLDBoM3YxNmgtM1YweiIvPg0KCTwvZz4NCjwvZz4NCjxnIGlkPSJDYWxxdWVfMiIgZGlzcGxheT0ibm9uZSI+DQoJPGcgZGlzcGxheT0iaW5saW5lIj4NCgkJPHBhdGggZmlsbD0iI0ZGRkZGRiIgZD0iTTEuMywzLjRsMi4xLTIuMWwxMS4zLDExLjNsLTIuMSwyLjFMMS4zLDMuNHoiLz4NCgk8L2c+DQoJDQoJCTxyZWN0IHg9IjYuNSIgeT0iMCIgdHJhbnNmb3JtPSJtYXRyaXgoMC43MDcxIDAuNzA3MSAtMC43MDcxIDAuNzA3MSA3Ljk5OTkgLTMuMzEzNSkiIGRpc3BsYXk9ImlubGluZSIgZmlsbD0iI0ZGRkZGRiIgd2lkdGg9IjMiIGhlaWdodD0iMTYiLz4NCjwvZz4NCjwvc3ZnPg0K'), none; 1281 border: 0.1em solid #6 26262;1280 border: 0.1em solid #636363; 1282 1281 border-radius: .25em; } 1283 1282 -
themes/ductile/tpl/home.html
r2830 r3226 6 6 7 7 <title>{{tpl:BlogName encode_html="1"}}<tpl:PaginationIf start="0"> - {{tpl:lang page}} {{tpl:PaginationCurrent}}</tpl:PaginationIf></title> 8 <meta name="description" lang="{{tpl:BlogLanguage}}" content="{{tpl:BlogDescription cut_string="180" encode_html="1"}}<tpl:PaginationIf start="0"> - {{tpl:lang page}} {{tpl:PaginationCurrent}}</tpl:PaginationIf>" />8 <meta name="description" lang="{{tpl:BlogLanguage}}" content="{{tpl:BlogDescription cut_string="180" remove_html="1" encode_html="1"}}<tpl:PaginationIf start="0"> - {{tpl:lang page}} {{tpl:PaginationCurrent}}</tpl:PaginationIf>" /> 9 9 <meta name="copyright" content="{{tpl:BlogCopyrightNotice encode_html="1"}}" /> 10 10 <meta name="author" content="{{tpl:BlogEditor encode_html="1"}}" /> … … 13 13 <link rel="schema.dc" href="http://purl.org/dc/elements/1.1/" /> 14 14 <meta name="dc.title" lang="{{tpl:BlogLanguage}}" content="{{tpl:BlogName encode_html="1"}}<tpl:PaginationIf start="0"> - {{tpl:lang page}} {{tpl:PaginationCurrent}}</tpl:PaginationIf>" /> 15 <meta name="dc.description" lang="{{tpl:BlogLanguage}}" content="{{tpl:BlogDescription encode_html="1"}}" />15 <meta name="dc.description" lang="{{tpl:BlogLanguage}}" content="{{tpl:BlogDescription remove_html="1" encode_html="1"}}" /> 16 16 <meta name="dc.language" content="{{tpl:BlogLanguage}}" /> 17 17 <meta name="dc.publisher" content="{{tpl:BlogEditor encode_html="1"}}" />
Note: See TracChangeset
for help on using the changeset viewer.