diff options
| author | Friendika <info@friendika.com> | 2011-06-30 15:33:01 -0700 |
|---|---|---|
| committer | Friendika <info@friendika.com> | 2011-06-30 15:33:01 -0700 |
| commit | b03df35b02907a78a5787654a57e73810e707f6a (patch) | |
| tree | 6b5fa7024683b26ae0bf8c63a9177cd7ef20fe00 /view | |
| parent | 42a6bc81e9f6ddea5ac61e4b79a75515028dcfae (diff) | |
| parent | 4f1213b69f12e6df2350cd21c6de06128a03411d (diff) | |
| download | volse-hubzilla-b03df35b02907a78a5787654a57e73810e707f6a.tar.gz volse-hubzilla-b03df35b02907a78a5787654a57e73810e707f6a.tar.bz2 volse-hubzilla-b03df35b02907a78a5787654a57e73810e707f6a.zip | |
Merge branch 'pull'
Diffstat (limited to 'view')
| -rw-r--r-- | view/default.php | 1 | ||||
| -rw-r--r-- | view/field_richtext.tpl | 44 | ||||
| -rw-r--r-- | view/theme/duepuntozero/style.css | 63 | ||||
| -rw-r--r-- | view/theme/loozah/style.css | 51 |
4 files changed, 111 insertions, 48 deletions
diff --git a/view/default.php b/view/default.php index 60bda2669..0d4a69054 100644 --- a/view/default.php +++ b/view/default.php @@ -2,6 +2,7 @@ <html>
<head>
<title><?php if(x($page,'title')) echo $page['title'] ?></title>
+ <script>var baseurl="<?php echo $a->get_baseurl() ?>";</script>
<?php if(x($page,'htmlhead')) echo $page['htmlhead'] ?>
</head>
<body>
diff --git a/view/field_richtext.tpl b/view/field_richtext.tpl new file mode 100644 index 000000000..a5a453d32 --- /dev/null +++ b/view/field_richtext.tpl @@ -0,0 +1,44 @@ + + <div class='field richtext'> + <label for='id_$field.0'>$field.1</label> + <textarea name='$field.0' id='id_$field.0' class="fieldRichtext">$field.2</textarea> + <span class='field_help'>$field.3</span> + <script> + console.log(typeof tinyMCE); + if(typeof tinyMCE == "undefined") { + tinyMCE="loading"; + window.tinyMCEPreInit = { + suffix:"", + base: baseurl+"/library/tinymce/jscripts/tiny_mce/", + query:"", + }; + $(function(){ + $.getScript(baseurl +"/library/tinymce/jscripts/tiny_mce/tiny_mce_src.js", function(){ + tinyMCE.init({ + theme : "advanced", + mode : "specific_textareas", + editor_selector: "fieldRichtext", + plugins : "bbcode,paste", + theme_advanced_buttons1 : "bold,italic,underline,undo,redo,link,unlink,image,forecolor,formatselect,code", + theme_advanced_buttons2 : "", + theme_advanced_buttons3 : "", + theme_advanced_toolbar_location : "top", + theme_advanced_toolbar_align : "center", + theme_advanced_blockformats : "blockquote,code", + paste_text_sticky : true, + entity_encoding : "raw", + add_unload_trigger : false, + remove_linebreaks : false, + force_p_newlines : false, + force_br_newlines : true, + forced_root_block : '', + convert_urls: false, + content_css: baseurl+"/view/custom_tinymce.css", + theme_advanced_path : false, + }); + }); + }); + } + </script> + + </div> diff --git a/view/theme/duepuntozero/style.css b/view/theme/duepuntozero/style.css index 0c4b710c0..67a1546ee 100644 --- a/view/theme/duepuntozero/style.css +++ b/view/theme/duepuntozero/style.css @@ -2542,6 +2542,43 @@ a.mail-list-link { } /** + * Plugins settings + */ + +.settings-block > h3, +.settings-heading { + border-bottom: 1px solid #babdb6 +} + + +/** + * Form fields + */ +.field { + clear: left; + margin-bottom: 5px; + padding-bottom: 5px; +} + +.field label { + float: left; + width: 200px; +} + +.field input, +.field textarea { + width: 400px; +} +.field textarea { height: 100px; } +.field_help { + display: block; + margin-left: 200px; + color: #666666; + +} + + +/** * ADMIN */ #pending-update { @@ -2567,34 +2604,12 @@ a.mail-list-link { margin-left: 200px; } -#adminpage .field { - clear: left; - margin-bottom: 5px; - padding-bottom: 5px; +#adminpage h3 { + border-bottom: 1px solid #cccccc; } - #adminpage .field label { - float: left; - width: 200px; font-weight: bold; } - -#adminpage .field input, -#adminpage .field textarea { - width: 400px; -} -#adminpage .field textarea { height: 100px; } -#adminpage .field_help { - display: block; - margin-left: 200px; - color: #666666; - -} - -#adminpage h3 { - border-bottom: 1px solid #cccccc; -} - #adminpage .submit { clear:left; text-align: right; diff --git a/view/theme/loozah/style.css b/view/theme/loozah/style.css index c68e38b68..7802d176d 100644 --- a/view/theme/loozah/style.css +++ b/view/theme/loozah/style.css @@ -2559,6 +2559,33 @@ a.mail-list-link { left: 0px; top: 0px; } +/** + * Form fields + */ +.field { + clear: left; + margin-bottom: 5px; + padding-bottom: 5px; +} + +.field label { + float: left; + width: 200px; + font-weight: bold; +} + +.field input, +.field textarea { + width: 400px; +} +.field textarea { height: 100px; } +.field_help { + display: block; + margin-left: 200px; + color: #666666; + +} + /** * ADMIN @@ -2586,30 +2613,6 @@ a.mail-list-link { margin-left: 200px; } -#adminpage .field { - clear: left; - margin-bottom: 5px; - padding-bottom: 5px; -} - -#adminpage .field label { - float: left; - width: 200px; - font-weight: bold; -} - -#adminpage .field input, -#adminpage .field textarea { - width: 400px; -} -#adminpage .field textarea { height: 100px; } -#adminpage .field_help { - display: block; - margin-left: 200px; - color: #666666; - -} - #adminpage h3 { border-bottom: 1px solid #cccccc; } |