Changeset 1527 in ExiteCMS

Timestamp:

07/06/08 08:55:55 (4 years ago)

Author:

hverton

Message:

more fixed to the code block fold-out. Style sheet adjusted, line numbers right-aligned, made sure the options line under the block is the same width as the code block

Location:

trunk

Files:

• administration/tools/language_pack_English.php (modified) (1 diff)
• administration/tools/language_pack_Nederlands.php (modified) (1 diff)
• files/locales/en.main.global.php (modified) (1 diff)
• includes/forum_functions_include.php (modified) (3 diffs)
• includes/templates/forum.viewthread.tpl (modified) (1 diff)
• themes/ExiteCMS/templates/templates/_stylesheets.tpl (modified) (1 diff)

trunk/administration/tools/language_pack_English.php

@@ -2298 +2298 @@
         $localestrings['580'] = "skype";
         $localestrings['581'] = "Top";
+        $localestrings['582'] = "Toggle full code view";
+        $localestrings['583'] = "download this %s code";
+        $localestrings['584'] = "download";
+        $localestrings['585'] = "Code:";
         load_localestrings($localestrings, LP_LOCALE, "forum.main", $step);
 

trunk/administration/tools/language_pack_Nederlands.php

@@ -2298 +2298 @@
         $localestrings['580'] = "skype";
         $localestrings['581'] = "Naar boven";
+        $localestrings['582'] = "Zichtbare code aanpassen";
+        $localestrings['583'] = "deze %s code downloaden";
+        $localestrings['584'] = "download";
+        $localestrings['585'] = "Code:";
         load_localestrings($localestrings, LP_LOCALE, "forum.main", $step);
 

trunk/files/locales/en.main.global.php

@@ -3 +3 @@
 // locale       : English
 // locale name  : main.global
-// generated on : Sat Jul 5 2008, 12:21:41 CEST
+// generated on : Sat Jul 5 2008, 21:35:58 CEST
 // translators  : ExiteCMS team,WanWizard
 // ----------------------------------------------------------

trunk/includes/forum_functions_include.php

@@ -330 +330 @@
 
 function _parseubb_codeblock($matches) {
-    global $codeblocks, $blockcount, $current_message, $raw_color_blocks;
+    global $codeblocks, $blockcount, $current_message, $raw_color_blocks, $locale;
 
     // empty code block?
@@ -364 +364 @@
     $id = count($codeblocks);
     ++$blockcount;
-    $link = "<img src='".THEME."images/panel_on.gif' alt='' title='Toggle full code view' name='b_code_".$blockcount."' onclick=\"javascript:flipOverflow('code_".$blockcount."')\" />";
-    $link .= "<div class='side' style='display:inline;'> <a href='".BASEDIR."getfile.php?type=fc&amp;forum_id=".$current_message['forum_id']."&amp;thread_id=".$current_message['thread_id']."&amp;post_id=".$current_message['post_id']."&amp;id=".$id."' title='download this ".$matches[1]." code'>download</a> </div>";
-    $codeblocks[] = array("
-    <div id='box_code_".$blockcount."' class='codecontainer'>
-    <table class='codeblock' cellpadding='0' cellspacing='0'>
-        <tr style='padding:0px;margin:0px;'>
-            <td class='codenr'>".$ln."</td>
-            <td class='code'>".$matches[2]."</td>
-        </tr>
-    </table>
-    </div>".$link."
-    ", $matches[1]);
+    $link = "<table class='codecontainer' style='border:0px;'><tr><td align='left'><a href='".BASEDIR."getfile.php?type=fc&amp;forum_id=".$current_message['forum_id']."&amp;thread_id=".$current_message['thread_id']."&amp;post_id=".$current_message['post_id']."&amp;id=".$id."' title='".sprintf($locale['583'],$matches[1])."'>".$locale['584']."</a></td><td align='right'><img src='".THEME."images/right.gif' alt='' title='".$locale['582']."' name='b_code_".$blockcount."' onclick=\"javascript:flipOverflow('code_".$blockcount."')\" /></td></tr></table>";
+    $codeblocks[] = array("<div id='box_code_".$blockcount."' class='codecontainer'><table class='codeblock' cellpadding='0' cellspacing='0'><tr style='padding:0px;margin:0px;'><td class='codenr'>".$ln."</td><td class='code'>".$matches[2]."</td></tr></table></div>".$link, $matches[1]);
     return "{**@".($id)."@**}";
 }
@@ -427 +417 @@
     $rawmsg = parseubb($rawmsg);
     // convert any newlines to html <br>
+    $rawmsg = str_replace("\r\n\r\n", "\r\n", $rawmsg);
     $rawmsg = nl2br($rawmsg);
+    
 
     // re-insert the saved code blocks

trunk/includes/templates/forum.viewthread.tpl

@@ -22 +22 @@
 function flipOverflow(who) {
     var tmp;
-    var status;
-    if (document.images['b_' + who].src.indexOf('_on') == -1) { 
-        tmp = document.images['b_' + who].src.replace('_off', '_on');
+    if (document.images['b_' + who].src.indexOf('right.gif') == -1) {
+        tmp = document.images['b_' + who].src.replace('left.gif', 'right.gif');
         document.getElementById('box_' + who).style.overflowX = 'hidden';
         document.getElementById('box_' + who).style.overflow = 'hidden';
     } else { 
-        tmp = document.images['b_' + who].src.replace('_on', '_off');
+        tmp = document.images['b_' + who].src.replace('right.gif', 'left.gif');
         if (BrowserDetect.browser == "Explorer") {
             document.getElementById('box_' + who).style.overflowX = 'scroll';

trunk/themes/ExiteCMS/templates/templates/_stylesheets.tpl

@@ -176 +176 @@
 .quote                  { color:#333; background-color:#ddd; padding:4px; margin:5px 10px 5px 10px; border:1px #444 solid; }
 
-.codecontainer          { width:480px; background-color:#ffffef; border:1px #bbb solid; overflow:hidden; position:relative; z-index:1; }
+.codecontainer          { width:480px; border:1px #bbb solid; overflow:hidden; position:relative; z-index:1; }
 .codeblock              { }
-.codenr                 { font-family:monospace; font-size:1em; background-color:#fffef; padding: 0px 5px 0px 5px; vertical-align:top; }
+.codenr                 { font-family:monospace; font-size:1em; background-color:#ffffdf; padding: 0px 5px 0px 5px; vertical-align:top; text-align:right;}
 .code                   { font-family:monospace; background-color:#ffffef; white-space:nowrap; }