diff options
Diffstat (limited to 'view')
| -rw-r--r-- | view/de/htconfig.tpl | 2 | ||||
| -rw-r--r-- | view/en/htconfig.tpl | 2 | ||||
| -rw-r--r-- | view/es/htconfig.tpl | 2 | ||||
| -rw-r--r-- | view/fr/htconfig.tpl | 2 | ||||
| -rw-r--r-- | view/it/htconfig.tpl | 2 | ||||
| -rw-r--r-- | view/jot-header.tpl | 18 | ||||
| -rw-r--r-- | view/sv/htconfig.tpl | 2 | ||||
| -rw-r--r-- | view/theme/duepuntozero/style.css | 6 |
8 files changed, 25 insertions, 11 deletions
diff --git a/view/de/htconfig.tpl b/view/de/htconfig.tpl index d3bb6b411..0ce28b4a0 100644 --- a/view/de/htconfig.tpl +++ b/view/de/htconfig.tpl @@ -37,7 +37,7 @@ $a->config['admin_email'] = ''; // Maximum size of an imported message, 0 is unlimited -$a->config['max_import_size'] = 10000; +$a->config['max_import_size'] = 200000; // maximum size of uploaded photos diff --git a/view/en/htconfig.tpl b/view/en/htconfig.tpl index d3bb6b411..0ce28b4a0 100644 --- a/view/en/htconfig.tpl +++ b/view/en/htconfig.tpl @@ -37,7 +37,7 @@ $a->config['admin_email'] = ''; // Maximum size of an imported message, 0 is unlimited -$a->config['max_import_size'] = 10000; +$a->config['max_import_size'] = 200000; // maximum size of uploaded photos diff --git a/view/es/htconfig.tpl b/view/es/htconfig.tpl index 180f7885c..4de266112 100644 --- a/view/es/htconfig.tpl +++ b/view/es/htconfig.tpl @@ -37,7 +37,7 @@ $a->config['admin_email'] = ''; // Maximum size of an imported message, 0 is unlimited -$a->config['max_import_size'] = 10000; +$a->config['max_import_size'] = 200000; // maximum size of uploaded photos diff --git a/view/fr/htconfig.tpl b/view/fr/htconfig.tpl index d31d5a39f..c65114a68 100644 --- a/view/fr/htconfig.tpl +++ b/view/fr/htconfig.tpl @@ -37,7 +37,7 @@ $a->config['admin_email'] = ''; // Maximum size of an imported message, 0 is unlimited -$a->config['max_import_size'] = 10000; +$a->config['max_import_size'] = 200000; // maximum size of uploaded photos diff --git a/view/it/htconfig.tpl b/view/it/htconfig.tpl index 180f7885c..4de266112 100644 --- a/view/it/htconfig.tpl +++ b/view/it/htconfig.tpl @@ -37,7 +37,7 @@ $a->config['admin_email'] = ''; // Maximum size of an imported message, 0 is unlimited -$a->config['max_import_size'] = 10000; +$a->config['max_import_size'] = 200000; // maximum size of uploaded photos diff --git a/view/jot-header.tpl b/view/jot-header.tpl index 0fdd30209..3b4c8c615 100644 --- a/view/jot-header.tpl +++ b/view/jot-header.tpl @@ -3,6 +3,7 @@ <script language="javascript" type="text/javascript"> var editor; +var textlen = 0; tinyMCE.init({ theme : "advanced", @@ -29,23 +30,29 @@ tinyMCE.init({ //Character count ed.onKeyUp.add(function(ed, e) { var txt = tinyMCE.activeEditor.getContent(); - var text = txt.length; - if(txt.length <= 140) { + textlen = txt.length; + if(textlen != 0 && $('#jot-perms-icon').is('.unlock')) { + $('#profile-jot-desc').html(ispublic); + } + else { + $('#profile-jot-desc').html(' '); + } + if(textlen <= 140) { $('#character-counter').removeClass('red'); $('#character-counter').removeClass('orange'); $('#character-counter').addClass('grey'); } - if((txt.length > 140) && (txt .length <= 420)) { + if((textlen > 140) && (textlen <= 420)) { $('#character-counter').removeClass('grey'); $('#character-counter').removeClass('red'); $('#character-counter').addClass('orange'); } - if(txt.length > 420) { + if(textlen > 420) { $('#character-counter').removeClass('grey'); $('#character-counter').removeClass('orange'); $('#character-counter').addClass('red'); } - $('#character-counter').text(text); + $('#character-counter').text(textlen); }); ed.onInit.add(function(ed) { @@ -58,6 +65,7 @@ tinyMCE.init({ </script> <script type="text/javascript" src="include/ajaxupload.js" ></script> <script> + var ispublic = '$ispublic'; $(document).ready(function() { var uploader = new window.AjaxUpload( 'wall-image-upload', diff --git a/view/sv/htconfig.tpl b/view/sv/htconfig.tpl index d3bb6b411..0ce28b4a0 100644 --- a/view/sv/htconfig.tpl +++ b/view/sv/htconfig.tpl @@ -37,7 +37,7 @@ $a->config['admin_email'] = ''; // Maximum size of an imported message, 0 is unlimited -$a->config['max_import_size'] = 10000; +$a->config['max_import_size'] = 200000; // maximum size of uploaded photos diff --git a/view/theme/duepuntozero/style.css b/view/theme/duepuntozero/style.css index a23f72987..5f8f06a6c 100644 --- a/view/theme/duepuntozero/style.css +++ b/view/theme/duepuntozero/style.css @@ -1895,9 +1895,11 @@ a.mail-list-link { #profile-jot-desc { /*float: left;*/ width: 480px; + color: #FF0000; margin-top: 10px; margin-bottom: 10px; } + #character-counter { float: right; font-size: 120%; @@ -2347,6 +2349,10 @@ a.mail-list-link { width: 300px; } +#contact-edit-links .icon, #contact-drop-links .icon { + margin: 0px 3px 0px 3px; +} + /** * ICONS */ |