diff options
author | zottel <github@zottel.net> | 2012-03-21 08:08:23 +0100 |
---|---|---|
committer | zottel <github@zottel.net> | 2012-03-21 08:08:23 +0100 |
commit | 88bbc5e0bc89f84aaf5160546dfa782f8f1d7e5e (patch) | |
tree | dd2eff7d2870ee2c292fd39e69cdaa5a0a9b2fdb /library/tinymce/jscripts/tiny_mce/plugins/advhr | |
parent | cf347664165f97b5262d15464bbb169cbdb4ddd4 (diff) | |
parent | efd7c14c24aa45878ddc412413ea1593cafcd651 (diff) | |
download | volse-hubzilla-88bbc5e0bc89f84aaf5160546dfa782f8f1d7e5e.tar.gz volse-hubzilla-88bbc5e0bc89f84aaf5160546dfa782f8f1d7e5e.tar.bz2 volse-hubzilla-88bbc5e0bc89f84aaf5160546dfa782f8f1d7e5e.zip |
Merge remote branch 'upstream/master'
Diffstat (limited to 'library/tinymce/jscripts/tiny_mce/plugins/advhr')
-rw-r--r--[-rwxr-xr-x] | library/tinymce/jscripts/tiny_mce/plugins/advhr/css/advhr.css | 0 | ||||
-rw-r--r--[-rwxr-xr-x] | library/tinymce/jscripts/tiny_mce/plugins/advhr/editor_plugin.js | 0 | ||||
-rw-r--r--[-rwxr-xr-x] | library/tinymce/jscripts/tiny_mce/plugins/advhr/editor_plugin_src.js | 0 | ||||
-rw-r--r--[-rwxr-xr-x] | library/tinymce/jscripts/tiny_mce/plugins/advhr/js/rule.js | 0 | ||||
-rw-r--r--[-rwxr-xr-x] | library/tinymce/jscripts/tiny_mce/plugins/advhr/langs/en_dlg.js | 6 | ||||
-rw-r--r--[-rwxr-xr-x] | library/tinymce/jscripts/tiny_mce/plugins/advhr/rule.htm | 59 |
6 files changed, 31 insertions, 34 deletions
diff --git a/library/tinymce/jscripts/tiny_mce/plugins/advhr/css/advhr.css b/library/tinymce/jscripts/tiny_mce/plugins/advhr/css/advhr.css index 0e2283498..0e2283498 100755..100644 --- a/library/tinymce/jscripts/tiny_mce/plugins/advhr/css/advhr.css +++ b/library/tinymce/jscripts/tiny_mce/plugins/advhr/css/advhr.css diff --git a/library/tinymce/jscripts/tiny_mce/plugins/advhr/editor_plugin.js b/library/tinymce/jscripts/tiny_mce/plugins/advhr/editor_plugin.js index 4d3b062de..4d3b062de 100755..100644 --- a/library/tinymce/jscripts/tiny_mce/plugins/advhr/editor_plugin.js +++ b/library/tinymce/jscripts/tiny_mce/plugins/advhr/editor_plugin.js diff --git a/library/tinymce/jscripts/tiny_mce/plugins/advhr/editor_plugin_src.js b/library/tinymce/jscripts/tiny_mce/plugins/advhr/editor_plugin_src.js index 0c652d330..0c652d330 100755..100644 --- a/library/tinymce/jscripts/tiny_mce/plugins/advhr/editor_plugin_src.js +++ b/library/tinymce/jscripts/tiny_mce/plugins/advhr/editor_plugin_src.js diff --git a/library/tinymce/jscripts/tiny_mce/plugins/advhr/js/rule.js b/library/tinymce/jscripts/tiny_mce/plugins/advhr/js/rule.js index b6cbd66c7..b6cbd66c7 100755..100644 --- a/library/tinymce/jscripts/tiny_mce/plugins/advhr/js/rule.js +++ b/library/tinymce/jscripts/tiny_mce/plugins/advhr/js/rule.js diff --git a/library/tinymce/jscripts/tiny_mce/plugins/advhr/langs/en_dlg.js b/library/tinymce/jscripts/tiny_mce/plugins/advhr/langs/en_dlg.js index 873bfd8d3..0c3bf15e6 100755..100644 --- a/library/tinymce/jscripts/tiny_mce/plugins/advhr/langs/en_dlg.js +++ b/library/tinymce/jscripts/tiny_mce/plugins/advhr/langs/en_dlg.js @@ -1,5 +1 @@ -tinyMCE.addI18n('en.advhr_dlg',{
-width:"Width",
-size:"Height",
-noshade:"No shadow"
-});
\ No newline at end of file +tinyMCE.addI18n('en.advhr_dlg',{size:"Height",noshade:"No Shadow",width:"Width",normal:"Normal",widthunits:"Units"});
\ No newline at end of file diff --git a/library/tinymce/jscripts/tiny_mce/plugins/advhr/rule.htm b/library/tinymce/jscripts/tiny_mce/plugins/advhr/rule.htm index fc37b2aec..843e1f8f0 100755..100644 --- a/library/tinymce/jscripts/tiny_mce/plugins/advhr/rule.htm +++ b/library/tinymce/jscripts/tiny_mce/plugins/advhr/rule.htm @@ -8,43 +8,44 @@ <script type="text/javascript" src="../../utils/form_utils.js"></script>
<link href="css/advhr.css" rel="stylesheet" type="text/css" />
</head>
-<body>
+<body role="application">
<form onsubmit="AdvHRDialog.update();return false;" action="#">
<div class="tabs">
<ul>
- <li id="general_tab" class="current"><span><a href="javascript:mcTabs.displayTab('general_tab','general_panel');" onmousedown="return false;">{#advhr.advhr_desc}</a></span></li>
+ <li id="general_tab" class="current" aria-controls="general_panel"><span><a href="javascript:mcTabs.displayTab('general_tab','general_panel');" onmousedown="return false;">{#advhr.advhr_desc}</a></span></li>
</ul>
</div>
<div class="panel_wrapper">
<div id="general_panel" class="panel current">
- <table border="0" cellpadding="4" cellspacing="0">
- <tr>
- <td><label for="width">{#advhr_dlg.width}</label></td>
- <td class="nowrap">
- <input id="width" name="width" type="text" value="" class="mceFocus" />
- <select name="width2" id="width2">
- <option value="">px</option>
- <option value="%">%</option>
- </select>
- </td>
- </tr>
- <tr>
- <td><label for="size">{#advhr_dlg.size}</label></td>
- <td><select id="size" name="size">
- <option value="">Normal</option>
- <option value="1">1</option>
- <option value="2">2</option>
- <option value="3">3</option>
- <option value="4">4</option>
- <option value="5">5</option>
- </select></td>
- </tr>
- <tr>
- <td><label for="noshade">{#advhr_dlg.noshade}</label></td>
- <td><input type="checkbox" name="noshade" id="noshade" class="radio" /></td>
- </tr>
- </table>
+ <table role="presentation" border="0" cellpadding="4" cellspacing="0">
+ <tr role="group" aria-labelledby="width_label">
+ <td><label id="width_label" for="width">{#advhr_dlg.width}</label></td>
+ <td class="nowrap">
+ <input id="width" name="width" type="text" value="" class="mceFocus" />
+ <span style="display:none;" id="width_unit_label">{#advhr_dlg.widthunits}</span>
+ <select name="width2" id="width2" aria-labelledby="width_unit_label">
+ <option value="">px</option>
+ <option value="%">%</option>
+ </select>
+ </td>
+ </tr>
+ <tr>
+ <td><label for="size">{#advhr_dlg.size}</label></td>
+ <td><select id="size" name="size">
+ <option value="">{#advhr_dlg.normal}</option>
+ <option value="1">1</option>
+ <option value="2">2</option>
+ <option value="3">3</option>
+ <option value="4">4</option>
+ <option value="5">5</option>
+ </select></td>
+ </tr>
+ <tr>
+ <td><label for="noshade">{#advhr_dlg.noshade}</label></td>
+ <td><input type="checkbox" name="noshade" id="noshade" class="radio" /></td>
+ </tr>
+ </table>
</div>
</div>
|