From 7c804c693bd7a0e6724efc7ef2d7f45b250edd6a Mon Sep 17 00:00:00 2001 From: Sjon Hortensius Date: Sun, 11 Jan 2015 16:35:31 +0100 Subject: Some tweaks for global tpl considerations * pkg_mgr* - removed icon-hrefs with actual buttons * system - made labels shorter, added label in content column too, fix submit-button alignment * installed_packages.widget - updated to bootstrap * syntax-highlighter - removed, unused --- README.md | 1 + .../code-syntax-highlighter/SyntaxHighlighter.css | 166 ------ usr/local/www/code-syntax-highlighter/gpl.txt | 340 ----------- .../www/code-syntax-highlighter/shBrushCSharp.js | 30 - .../www/code-syntax-highlighter/shBrushCpp.js | 72 --- .../www/code-syntax-highlighter/shBrushCss.js | 50 -- .../www/code-syntax-highlighter/shBrushDelphi.js | 31 - .../www/code-syntax-highlighter/shBrushJScript.js | 22 - .../www/code-syntax-highlighter/shBrushJava.js | 26 - .../www/code-syntax-highlighter/shBrushPhp.js | 23 - .../www/code-syntax-highlighter/shBrushPython.js | 71 --- .../www/code-syntax-highlighter/shBrushRuby.js | 26 - .../www/code-syntax-highlighter/shBrushSql.js | 40 -- usr/local/www/code-syntax-highlighter/shBrushVb.js | 29 - .../www/code-syntax-highlighter/shBrushXml.js | 61 -- usr/local/www/code-syntax-highlighter/shCore.js | 589 ------------------- .../code-syntax-highlighter/shCore.uncompressed.js | 636 --------------------- usr/local/www/pkg_mgr.php | 8 +- usr/local/www/pkg_mgr_installed.php | 16 +- usr/local/www/system.php | 20 +- .../widgets/widgets/installed_packages.widget.php | 132 ++--- usr/local/www/widgets/widgets/ipsec.widget.php | 11 +- 22 files changed, 82 insertions(+), 2318 deletions(-) delete mode 100644 usr/local/www/code-syntax-highlighter/SyntaxHighlighter.css delete mode 100644 usr/local/www/code-syntax-highlighter/gpl.txt delete mode 100644 usr/local/www/code-syntax-highlighter/shBrushCSharp.js delete mode 100644 usr/local/www/code-syntax-highlighter/shBrushCpp.js delete mode 100644 usr/local/www/code-syntax-highlighter/shBrushCss.js delete mode 100644 usr/local/www/code-syntax-highlighter/shBrushDelphi.js delete mode 100644 usr/local/www/code-syntax-highlighter/shBrushJScript.js delete mode 100644 usr/local/www/code-syntax-highlighter/shBrushJava.js delete mode 100644 usr/local/www/code-syntax-highlighter/shBrushPhp.js delete mode 100644 usr/local/www/code-syntax-highlighter/shBrushPython.js delete mode 100644 usr/local/www/code-syntax-highlighter/shBrushRuby.js delete mode 100644 usr/local/www/code-syntax-highlighter/shBrushSql.js delete mode 100644 usr/local/www/code-syntax-highlighter/shBrushVb.js delete mode 100644 usr/local/www/code-syntax-highlighter/shBrushXml.js delete mode 100644 usr/local/www/code-syntax-highlighter/shCore.js delete mode 100644 usr/local/www/code-syntax-highlighter/shCore.uncompressed.js diff --git a/README.md b/README.md index af1a5e2..409424a 100644 --- a/README.md +++ b/README.md @@ -9,5 +9,6 @@ We are migrating pfSense to Bootstrap. You can help! Please respect these code-g * limited attributes on elements; _no style attributes_ * no inline javascript * html attributes should be using double-quoted attribute-values. This means your php-code should probably use single-quoted strings +* we use icons for status-indication and buttons for actions If you feel adventurous you can sometimes rewrite some PHP & javascript code as well; but try to keep this to a minimum. \ No newline at end of file diff --git a/usr/local/www/code-syntax-highlighter/SyntaxHighlighter.css b/usr/local/www/code-syntax-highlighter/SyntaxHighlighter.css deleted file mode 100644 index 413a034..0000000 --- a/usr/local/www/code-syntax-highlighter/SyntaxHighlighter.css +++ /dev/null @@ -1,166 +0,0 @@ - -/* Main style for the table */ - -.dp-highlighter { - width: 100%; - overflow: auto; - line-height: 100% !important; - margin: 18px 0px 18px 0px; -} - -.dp-highlighter table { - width: 100%; - margin: 2px 0px 2px 0px; - border-collapse: collapse; - border-bottom: 2px solid #eee; - background-color: #fff; -} - -.dp-highlighter td -{ - font-family: Courier New; - font-size: 11px; -} - -/* Styles for the tools */ - -.dp-highlighter .tools-corner { - background-color: #eee; - font-size: 9px; -} - -.dp-highlighter .tools { - background-color: #eee; - padding: 3px 8px 3px 0px; - border-bottom: 1px solid gray; - font: 9px Verdana, Geneva, Arial, Helvetica, sans-serif; - color: silver; -} - -.dp-highlighter .tools a { - font-size: 9px; - color: gray; - text-decoration: none; -} - -.dp-highlighter .tools a:hover { - color: red; - text-decoration: underline; -} - -/* Gutter with line number */ - -.dp-highlighter .gutter { - padding-right: 5px; - padding-left: 10px; - width: 5px; - background-color: #eee; - border-right: 1px solid gray; - color: gray; - text-align: right; - vertical-align: top; -} - -/* Single line style */ - -.dp-highlighter .line { - padding-left: 10px; - border-bottom: 1px solid #F7F7F7; - white-space:nowrap; -} - -/* About dialog styles */ - -.dp-about { - background-color: #fff; - margin: 0px; -} - -.dp-about table { - width: 100%; - height: 100%; - font-size: 11px; - font-family: Tahoma, Verdana, Arial, sans-serif !important; -} - -.dp-about td { - padding: 10px; - vertical-align: top; -} - -.dp-about .copy { - border-bottom: 1px solid #ACA899; - height: 95%; -} - -.dp-about .title { - color: red; - font-weight: bold; -} - -.dp-about .para { - margin-bottom: 4px; -} - -.dp-about .footer { - background-color: #ECEADB; - border-top: 1px solid #fff; - text-align: right; -} - -.dp-about .close { - font-size: 11px; - font-family: Tahoma, Verdana, Arial, sans-serif !important; - background-color: #ECEADB; - width: 60px; - height: 22px; -} - -/* Language specific styles */ - -.dp-c {} -.dp-c .comment { color: green; } -.dp-c .string { color: blue; } -.dp-c .preprocessor { color: gray; } -.dp-c .keyword { color: blue; } -.dp-c .vars { color: #d00; } - -.dp-vb {} -.dp-vb .comment { color: green; } -.dp-vb .string { color: blue; } -.dp-vb .preprocessor { color: gray; } -.dp-vb .keyword { color: blue; } - -.dp-sql {} -.dp-sql .comment { color: green; } -.dp-sql .string { color: red; } -.dp-sql .keyword { color: blue; } -.dp-sql .func { color: #ff1493; } -.dp-sql .op { color: #808080; } - -.dp-xml {} -.dp-xml .cdata { color: #ff1493; } -.dp-xml .comments { color: green; } -.dp-xml .tag { color: blue; } -.dp-xml .tag-name { color: black; font-weight: bold; } -.dp-xml .attribute { color: red; } -.dp-xml .attribute-value { color: blue; } - -.dp-delphi {} -.dp-delphi .comment { color: #008200; font-style: italic; } -.dp-delphi .string { color: blue; } -.dp-delphi .number { color: blue; } -.dp-delphi .directive { color: #008284; } -.dp-delphi .keyword { font-weight: bold; color: navy; } -.dp-delphi .vars { color: #000; } - -.dp-py {} -.dp-py .comment { color: green; } -.dp-py .string { color: red; } -.dp-py .docstring { color: brown; } -.dp-py .keyword { color: blue; font-weight: bold;} -.dp-py .builtins { color: #ff1493; } -.dp-py .magicmethods { color: #808080; } -.dp-py .exceptions { color: brown; } -.dp-py .types { color: brown; font-style: italic; } -.dp-py .commonlibs { color: #8A2BE2; font-style: italic; } diff --git a/usr/local/www/code-syntax-highlighter/gpl.txt b/usr/local/www/code-syntax-highlighter/gpl.txt deleted file mode 100644 index 5b6e7c6..0000000 --- a/usr/local/www/code-syntax-highlighter/gpl.txt +++ /dev/null @@ -1,340 +0,0 @@ - GNU GENERAL PUBLIC LICENSE - Version 2, June 1991 - - Copyright (C) 1989, 1991 Free Software Foundation, Inc. - 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - Everyone is permitted to copy and distribute verbatim copies - of this license document, but changing it is not allowed. - - Preamble - - The licenses for most software are designed to take away your -freedom to share and change it. By contrast, the GNU General Public -License is intended to guarantee your freedom to share and change free -software--to make sure the software is free for all its users. This -General Public License applies to most of the Free Software -Foundation's software and to any other program whose authors commit to -using it. (Some other Free Software Foundation software is covered by -the GNU Library General Public License instead.) You can apply it to -your programs, too. - - When we speak of free software, we are referring to freedom, not -price. Our General Public Licenses are designed to make sure that you -have the freedom to distribute copies of free software (and charge for -this service if you wish), that you receive source code or can get it -if you want it, that you can change the software or use pieces of it -in new free programs; and that you know you can do these things. - - To protect your rights, we need to make restrictions that forbid -anyone to deny you these rights or to ask you to surrender the rights. -These restrictions translate to certain responsibilities for you if you -distribute copies of the software, or if you modify it. - - For example, if you distribute copies of such a program, whether -gratis or for a fee, you must give the recipients all the rights that -you have. You must make sure that they, too, receive or can get the -source code. And you must show them these terms so they know their -rights. - - We protect your rights with two steps: (1) copyright the software, and -(2) offer you this license which gives you legal permission to copy, -distribute and/or modify the software. - - Also, for each author's protection and ours, we want to make certain -that everyone understands that there is no warranty for this free -software. If the software is modified by someone else and passed on, we -want its recipients to know that what they have is not the original, so -that any problems introduced by others will not reflect on the original -authors' reputations. - - Finally, any free program is threatened constantly by software -patents. We wish to avoid the danger that redistributors of a free -program will individually obtain patent licenses, in effect making the -program proprietary. To prevent this, we have made it clear that any -patent must be licensed for everyone's free use or not licensed at all. - - The precise terms and conditions for copying, distribution and -modification follow. - - GNU GENERAL PUBLIC LICENSE - TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION - - 0. This License applies to any program or other work which contains -a notice placed by the copyright holder saying it may be distributed -under the terms of this General Public License. The "Program", below, -refers to any such program or work, and a "work based on the Program" -means either the Program or any derivative work under copyright law: -that is to say, a work containing the Program or a portion of it, -either verbatim or with modifications and/or translated into another -language. (Hereinafter, translation is included without limitation in -the term "modification".) Each licensee is addressed as "you". - -Activities other than copying, distribution and modification are not -covered by this License; they are outside its scope. The act of -running the Program is not restricted, and the output from the Program -is covered only if its contents constitute a work based on the -Program (independent of having been made by running the Program). -Whether that is true depends on what the Program does. - - 1. You may copy and distribute verbatim copies of the Program's -source code as you receive it, in any medium, provided that you -conspicuously and appropriately publish on each copy an appropriate -copyright notice and disclaimer of warranty; keep intact all the -notices that refer to this License and to the absence of any warranty; -and give any other recipients of the Program a copy of this License -along with the Program. - -You may charge a fee for the physical act of transferring a copy, and -you may at your option offer warranty protection in exchange for a fee. - - 2. You may modify your copy or copies of the Program or any portion -of it, thus forming a work based on the Program, and copy and -distribute such modifications or work under the terms of Section 1 -above, provided that you also meet all of these conditions: - - a) You must cause the modified files to carry prominent notices - stating that you changed the files and the date of any change. - - b) You must cause any work that you distribute or publish, that in - whole or in part contains or is derived from the Program or any - part thereof, to be licensed as a whole at no charge to all third - parties under the terms of this License. - - c) If the modified program normally reads commands interactively - when run, you must cause it, when started running for such - interactive use in the most ordinary way, to print or display an - announcement including an appropriate copyright notice and a - notice that there is no warranty (or else, saying that you provide - a warranty) and that users may redistribute the program under - these conditions, and telling the user how to view a copy of this - License. (Exception: if the Program itself is interactive but - does not normally print such an announcement, your work based on - the Program is not required to print an announcement.) - -These requirements apply to the modified work as a whole. If -identifiable sections of that work are not derived from the Program, -and can be reasonably considered independent and separate works in -themselves, then this License, and its terms, do not apply to those -sections when you distribute them as separate works. But when you -distribute the same sections as part of a whole which is a work based -on the Program, the distribution of the whole must be on the terms of -this License, whose permissions for other licensees extend to the -entire whole, and thus to each and every part regardless of who wrote it. - -Thus, it is not the intent of this section to claim rights or contest -your rights to work written entirely by you; rather, the intent is to -exercise the right to control the distribution of derivative or -collective works based on the Program. - -In addition, mere aggregation of another work not based on the Program -with the Program (or with a work based on the Program) on a volume of -a storage or distribution medium does not bring the other work under -the scope of this License. - - 3. You may copy and distribute the Program (or a work based on it, -under Section 2) in object code or executable form under the terms of -Sections 1 and 2 above provided that you also do one of the following: - - a) Accompany it with the complete corresponding machine-readable - source code, which must be distributed under the terms of Sections - 1 and 2 above on a medium customarily used for software interchange; or, - - b) Accompany it with a written offer, valid for at least three - years, to give any third party, for a charge no more than your - cost of physically performing source distribution, a complete - machine-readable copy of the corresponding source code, to be - distributed under the terms of Sections 1 and 2 above on a medium - customarily used for software interchange; or, - - c) Accompany it with the information you received as to the offer - to distribute corresponding source code. (This alternative is - allowed only for noncommercial distribution and only if you - received the program in object code or executable form with such - an offer, in accord with Subsection b above.) - -The source code for a work means the preferred form of the work for -making modifications to it. For an executable work, complete source -code means all the source code for all modules it contains, plus any -associated interface definition files, plus the scripts used to -control compilation and installation of the executable. However, as a -special exception, the source code distributed need not include -anything that is normally distributed (in either source or binary -form) with the major components (compiler, kernel, and so on) of the -operating system on which the executable runs, unless that component -itself accompanies the executable. - -If distribution of executable or object code is made by offering -access to copy from a designated place, then offering equivalent -access to copy the source code from the same place counts as -distribution of the source code, even though third parties are not -compelled to copy the source along with the object code. - - 4. You may not copy, modify, sublicense, or distribute the Program -except as expressly provided under this License. Any attempt -otherwise to copy, modify, sublicense or distribute the Program is -void, and will automatically terminate your rights under this License. -However, parties who have received copies, or rights, from you under -this License will not have their licenses terminated so long as such -parties remain in full compliance. - - 5. You are not required to accept this License, since you have not -signed it. However, nothing else grants you permission to modify or -distribute the Program or its derivative works. These actions are -prohibited by law if you do not accept this License. Therefore, by -modifying or distributing the Program (or any work based on the -Program), you indicate your acceptance of this License to do so, and -all its terms and conditions for copying, distributing or modifying -the Program or works based on it. - - 6. Each time you redistribute the Program (or any work based on the -Program), the recipient automatically receives a license from the -original licensor to copy, distribute or modify the Program subject to -these terms and conditions. You may not impose any further -restrictions on the recipients' exercise of the rights granted herein. -You are not responsible for enforcing compliance by third parties to -this License. - - 7. If, as a consequence of a court judgment or allegation of patent -infringement or for any other reason (not limited to patent issues), -conditions are imposed on you (whether by court order, agreement or -otherwise) that contradict the conditions of this License, they do not -excuse you from the conditions of this License. If you cannot -distribute so as to satisfy simultaneously your obligations under this -License and any other pertinent obligations, then as a consequence you -may not distribute the Program at all. For example, if a patent -license would not permit royalty-free redistribution of the Program by -all those who receive copies directly or indirectly through you, then -the only way you could satisfy both it and this License would be to -refrain entirely from distribution of the Program. - -If any portion of this section is held invalid or unenforceable under -any particular circumstance, the balance of the section is intended to -apply and the section as a whole is intended to apply in other -circumstances. - -It is not the purpose of this section to induce you to infringe any -patents or other property right claims or to contest validity of any -such claims; this section has the sole purpose of protecting the -integrity of the free software distribution system, which is -implemented by public license practices. Many people have made -generous contributions to the wide range of software distributed -through that system in reliance on consistent application of that -system; it is up to the author/donor to decide if he or she is willing -to distribute software through any other system and a licensee cannot -impose that choice. - -This section is intended to make thoroughly clear what is believed to -be a consequence of the rest of this License. - - 8. If the distribution and/or use of the Program is restricted in -certain countries either by patents or by copyrighted interfaces, the -original copyright holder who places the Program under this License -may add an explicit geographical distribution limitation excluding -those countries, so that distribution is permitted only in or among -countries not thus excluded. In such case, this License incorporates -the limitation as if written in the body of this License. - - 9. The Free Software Foundation may publish revised and/or new versions -of the General Public License from time to time. Such new versions will -be similar in spirit to the present version, but may differ in detail to -address new problems or concerns. - -Each version is given a distinguishing version number. If the Program -specifies a version number of this License which applies to it and "any -later version", you have the option of following the terms and conditions -either of that version or of any later version published by the Free -Software Foundation. If the Program does not specify a version number of -this License, you may choose any version ever published by the Free Software -Foundation. - - 10. If you wish to incorporate parts of the Program into other free -programs whose distribution conditions are different, write to the author -to ask for permission. For software which is copyrighted by the Free -Software Foundation, write to the Free Software Foundation; we sometimes -make exceptions for this. Our decision will be guided by the two goals -of preserving the free status of all derivatives of our free software and -of promoting the sharing and reuse of software generally. - - NO WARRANTY - - 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY -FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN -OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES -PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED -OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS -TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE -PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, -REPAIR OR CORRECTION. - - 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING -WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR -REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, -INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING -OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED -TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY -YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER -PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE -POSSIBILITY OF SUCH DAMAGES. - - END OF TERMS AND CONDITIONS - - How to Apply These Terms to Your New Programs - - If you develop a new program, and you want it to be of the greatest -possible use to the public, the best way to achieve this is to make it -free software which everyone can redistribute and change under these terms. - - To do so, attach the following notices to the program. It is safest -to attach them to the start of each source file to most effectively -convey the exclusion of warranty; and each file should have at least -the "copyright" line and a pointer to where the full notice is found. - - - Copyright (C) - - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - - -Also add information on how to contact you by electronic and paper mail. - -If the program is interactive, make it output a short notice like this -when it starts in an interactive mode: - - Gnomovision version 69, Copyright (C) year name of author - Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'. - This is free software, and you are welcome to redistribute it - under certain conditions; type `show c' for details. - -The hypothetical commands `show w' and `show c' should show the appropriate -parts of the General Public License. Of course, the commands you use may -be called something other than `show w' and `show c'; they could even be -mouse-clicks or menu items--whatever suits your program. - -You should also get your employer (if you work as a programmer) or your -school, if any, to sign a "copyright disclaimer" for the program, if -necessary. Here is a sample; alter the names: - - Yoyodyne, Inc., hereby disclaims all copyright interest in the program - `Gnomovision' (which makes passes at compilers) written by James Hacker. - - , 1 April 1989 - Ty Coon, President of Vice - -This General Public License does not permit incorporating your program into -proprietary programs. If your program is a subroutine library, you may -consider it more useful to permit linking proprietary applications with the -library. If this is what you want to do, use the GNU Library General -Public License instead of this License. diff --git a/usr/local/www/code-syntax-highlighter/shBrushCSharp.js b/usr/local/www/code-syntax-highlighter/shBrushCSharp.js deleted file mode 100644 index 5743b93..0000000 --- a/usr/local/www/code-syntax-highlighter/shBrushCSharp.js +++ /dev/null @@ -1,30 +0,0 @@ -dp.sh.Brushes.CSharp = function() -{ - var keywords = 'abstract as base bool break byte case catch char checked class const ' + - 'continue decimal default delegate do double else enum event explicit ' + - 'extern false finally fixed float for foreach get goto if implicit in int ' + - 'interface internal is lock long namespace new null object operator out ' + - 'override params private protected public readonly ref return sbyte sealed set ' + - 'short sizeof stackalloc static string struct switch this throw true try ' + - 'typeof uint ulong unchecked unsafe ushort using virtual void while'; - - this.regexList = [ - // There's a slight problem with matching single line comments and figuring out - // a difference between // and ///. Using lookahead and lookbehind solves the - // problem, unfortunately JavaScript doesn't support lookbehind. So I'm at a - // loss how to translate that regular expression to JavaScript compatible one. -// { regex: new RegExp('(?) - | () - | (<)*(\w+)*\s*(\w+)\s*=\s*(".*?"|'.*?'|\w+)(/*>)* - | () - */ - var index = 0; - var match = null; - var regex = null; - - // Match CDATA in the following format - // <\!\[[\w\s]*?\[(.|\s)*?\]\]> - this.GetMatches(new RegExp('<\\!\\[[\\w\\s]*?\\[(.|\\s)*?\\]\\]>', 'gm'), 'cdata'); - - // Match comments - // - this.GetMatches(new RegExp('', 'gm'), 'comments'); - - // Match attributes and their values - // (\w+)\s*=\s*(".*?"|\'.*?\'|\w+)* - regex = new RegExp('([\\w-\.]+)\\s*=\\s*(".*?"|\'.*?\'|\\w+)*', 'gm'); - while((match = regex.exec(this.code)) != null) - { - push(this.matches, new dp.sh.Match(match[1], match.index, 'attribute')); - - // if xml is invalid and attribute has no property value, ignore it - if(match[2] != undefined) - { - push(this.matches, new dp.sh.Match(match[2], match.index + match[0].indexOf(match[2]), 'attribute-value')); - } - } - - // Match opening and closing tag brackets - // - this.GetMatches(new RegExp('', 'gm'), 'tag'); - - // Match tag names - // - * - * - * - * - * - * - ** - * History: - * 1.1.0 - March 23rd, 2005 - * - split brushes into separate files - * - now works in Safari - * - added missing strings to PHP matches - * - * 1.0.4 - February 2nd, 2005 - * - added Delphi & Python - * - multi-line comments fixed - * - language name can be set through w3c valid 'class' attribute - * - HighlightAll(name, [showGutter], [showTools]) - * - * 1.0.3 - December 31th, 2004 (added PHP & SQL) - * 1.0.2 - December 28th, 2004 (refactoring with namespaces) - * 1.0.1 - December 14th, 2004 - * 1.0.0 - November 13th, 2004 - */ - -// create namespaces -var dp = { - sh : // dp.sh - { - Utils : {}, // dp.sh.Utils - Brushes : {} // dp.sh.Brushes - } -}; - -dp.sh.Config = { - Version : '1.1.0', - About : 'About...
dp.SyntaxHighlighter
Version: {V}
http://www.dreamprojections.com/SyntaxHighlighter
©2004-2005 Dream Projections Inc. All right reserved.
' -}; - -dp.SyntaxHighlighter = dp.sh; - - - -// opens a new windows and puts the original unformatted source code inside. -dp.sh.Utils.ViewSource = function(sender) -{ - var code = sender.parentNode.originalCode; - var wnd = window.open('', '_blank', 'width=750, height=400, location=0, resizable=1, menubar=0, scrollbars=1'); - - code = code.replace(/' + code + ''); - wnd.document.close(); -} - -// copies the original source code in to the clipboard (IE only) -dp.sh.Utils.ToClipboard = function(sender) -{ - var code = sender.parentNode.originalCode; - - // This works only for IE. There's a way to make it work with Mozilla as well, - // but it requires security settings changed on the client, which isn't by - // default, so 99% of users won't have it working anyways. - if(window.clipboardData) - { - window.clipboardData.setData('text', code); - - alert('The code is in your clipboard now.'); - } -} - -// creates an invisible iframe, puts the original source code inside and prints it -dp.sh.Utils.PrintSource = function(sender) -{ - var td = sender.parentNode; - var code = td.processedCode; - var iframe = document.createElement('iframe'); - var doc = null; - var wnd = - - // this hides the iframe - iframe.style.cssText = 'position:absolute; width:0px; height:0px; left:-5px; top:-5px;'; - - td.appendChild(iframe); - - doc = iframe.contentWindow.document; - code = code.replace(/' + code + ''); - doc.close(); - - iframe.contentWindow.focus(); - iframe.contentWindow.print(); - - td.removeChild(iframe); -} - -dp.sh.Utils.About = function() -{ - var wnd = window.open('', '_blank', 'dialog, width=320, height=150'); - var doc = wnd.document; - - var styles = document.getElementsByTagName('style'); - var links = document.getElementsByTagName('link'); - - doc.write(dp.sh.Config.About.replace('{V}', dp.sh.Config.Version)); - - // copy over ALL the styles from the parent page - for(var i = 0; i < styles.length; i++) - doc.write(''); - - for(var i = 0; i < links.length; i++) - if(links[i].rel.toLowerCase() == 'stylesheet') - doc.write(''); - - doc.close(); - wnd.focus(); -} - - - - - -// creates a new match object -dp.sh.Match = function(value, index, css) -{ - this.value = value; - this.index = index; - this.length = value.length; - this.css = css; -} - - - - - -dp.sh.Highlighter = function() -{ - this.addGutter = true; - this.addControls = true; - this.tabsToSpaces = true; -} - -// static callback for the match sorting -dp.sh.Highlighter.SortCallback = function(m1, m2) -{ - // sort matches by index first - if(m1.index < m2.index) - return -1; - else if(m1.index > m2.index) - return 1; - else - { - // if index is the same, sort by length - if(m1.length < m2.length) - return -1; - else if(m1.length > m2.length) - return 1; - } - return 0; -} - -// gets a list of all matches for a given regular expression -dp.sh.Highlighter.prototype.GetMatches = function(regex, css) -{ - var index = 0; - var match = null; - - while((match = regex.exec(this.code)) != null) - { - this.matches[this.matches.length] = new dp.sh.Match(match[0], match.index, css); - } -} - -dp.sh.Highlighter.prototype.AddBit = function(str, css) -{ - var span = document.createElement('span'); - - str = str.replace(/&/g, '&'); - str = str.replace(/ /g, ' '); - str = str.replace(/'); - - // when adding a piece of code, check to see if it has line breaks in it - // and if it does, wrap individual line breaks with span tags - if(css != null) - { - var regex = new RegExp('
', 'gi'); - - if(regex.test(str)) - { - var lines = str.split(' 
'); - - str = ''; - - for(var i = 0; i < lines.length; i++) - { - span = document.createElement('span'); - span.className = css; - span.innerHTML = lines[i]; - - this.div.appendChild(span); - - // don't add a
for the last line - if(i + 1 < lines.length) - { - this.div.appendChild(document.createElement('br')); - } - } - } - else - { - span.className = css; - span.innerHTML = str; - this.div.appendChild(span); - } - } - else - { - span.innerHTML = str; - this.div.appendChild(span); - } -} - -// checks if one match is inside another -dp.sh.Highlighter.prototype.IsInside = function(match) -{ - if(match == null || match.length == 0) - { - return; - } - - for(var i = 0; i < this.matches.length; i++) - { - var c = this.matches[i]; - - if(c == null) - { - continue; - } - - if((match.index > c.index) && (match.index <= c.index + c.length)) - { - return true; - } - } - - return false; -} - -dp.sh.Highlighter.prototype.ProcessRegexList = function() -{ - for(var i = 0; i < this.regexList.length; i++) - { - this.GetMatches(this.regexList[i].regex, this.regexList[i].css); - } -} - -dp.sh.Highlighter.prototype.ProcessSmartTabs = function(code) -{ - var lines = code.split('\n'); - var result = ''; - var tabSize = 4; - var tab = '\t'; - - // This function inserts specified amount of spaces in the string - // where a tab is while removing that given tab. - function InsertSpaces(line, pos, count) - { - var left = line.substr(0, pos); - var right = line.substr(pos + 1, line.length); // pos + 1 will get rid of the tab - var spaces = ''; - - for(var i = 0; i < count; i++) - { - spaces += ' '; - } - - return left + spaces + right; - } - - // This function process one line for 'smart tabs' - function ProcessLine(line, tabSize) - { - if(line.indexOf(tab) == -1) - { - return line; - } - - var pos = 0; - - while((pos = line.indexOf(tab)) != -1) - { - // This is pretty much all there is to the 'smart tabs' logic. - // Based on the position within the line and size of a tab, - // calculate the amount of spaces we need to insert. - var spaces = tabSize - pos % tabSize; - - line = InsertSpaces(line, pos, spaces); - } - - return line; - } - - // Go through all the lines and do the 'smart tabs' magic. - for(var i = 0; i < lines.length; i++) - { - var line = lines[i]; - result += ProcessLine(line, tabSize) + '\n'; - } - - return result; -} - -dp.sh.Highlighter.prototype.SwitchToTable = function() -{ - // Safari fix: for some reason lowercase
isn't getting picked up, even though 'i' is set - var lines = this.div.innerHTML.split(/
/gi); - var row = null; - var cell = null; - var html = ''; - var pipe = ' | '; - - // creates an anchor to a utility - function UtilHref(util, text) - { - return '' + text + ''; - } - - row = this.table.insertRow(-1); - - if(this.addGutter == true) - { - cell = row.insertCell(-1); - cell.className = 'tools-corner'; - } - - if(this.addControls == true) - { - cell = row.insertCell(-1); - - cell.originalCode = this.originalCode; - cell.processedCode = this.code; - - cell.className = 'tools'; - cell.innerHTML = UtilHref('ViewSource', 'view plain') + pipe + UtilHref('PrintSource', 'print'); - - if(window.clipboardData) - { - cell.innerHTML += pipe + UtilHref('ToClipboard', 'copy to clipboard'); - } - - cell.innerHTML += pipe + UtilHref('About', '?'); - } - - for(var i = 0; i < lines.length - 1; i++) - { - row = this.table.insertRow(-1); - - if(this.addGutter == true) - { - cell = row.insertCell(-1); - cell.className = 'gutter'; - cell.innerHTML = i + 1; - } - - cell = row.insertCell(-1); - cell.className = 'line'; - cell.innerHTML = lines[i]; - } - - this.div.innerHTML = ''; -} - -dp.sh.Highlighter.prototype.Highlight = function(code) -{ - // This function strips all new lines and spaces - // from the beging and end of the string . - function Trim(str) - { - var begining = new RegExp('^[\\s\\n]', 'g'); - var end = new RegExp('[\\s\\n]$', 'g'); - - while(begining.test(str)) - { - str = str.substr(1); - } - - while(end.test(str)) - { - str = str.substr(0, str.length - 1); - } - - return str; - } - - // This function returns a portions of the string - // from pos1 to pos2 inclusive. - function Copy(string, pos1, pos2) - { - return string.substr(pos1, pos2 - pos1); - } - - var pos = 0; - - this.originalCode = code; - this.code = Trim(code); - this.div = document.createElement('div'); - this.table = document.createElement('table'); - this.matches = new Array(); - - if(this.CssClass != null) - { - this.table.className = this.CssClass; - } - - // replace tabs with spaces - if(this.tabsToSpaces == true) - { - this.code = this.ProcessSmartTabs(this.code); - } - - this.table.border = 0; - this.table.cellSpacing = 0; - this.table.cellPadding = 0; - - this.ProcessRegexList(); - - // if no matches found, do nothing - if(this.matches.length == 0) - { - return; - } - - // sort the matches - this.matches = this.matches.sort(dp.sh.Highlighter.SortCallback); - - // The following loop checks to see if any of the matches are inside - // of other matches. This process would get rid of highligting strings - // inside comments, keywords inside strings and so on. - for(var i = 0; i < this.matches.length; i++) - { - if(this.IsInside(this.matches[i])) - { - this.matches[i] = null; - } - } - - // Finally, go through the final list of matches and pull the all - // together adding everything in between that isn't a match. - for(var i = 0; i < this.matches.length; i++) - { - var match = this.matches[i]; - - if(match == null || match.length == 0) - { - continue; - } - - this.AddBit(Copy(this.code, pos, match.index), null); - this.AddBit(match.value, match.css); - - pos = match.index + match.length; - } - - this.AddBit(this.code.substr(pos), null); - - this.SwitchToTable(); -} - -dp.sh.Highlighter.prototype.GetKeywords = function(str) -{ - return '\\b' + str.replace(/ /g, '\\b|\\b') + '\\b'; -} - -// highlightes all elements identified by name and gets source code from specified property -dp.sh.HighlightAll = function(name, showGutter /* optional */, showControls /* optional */) -{ - var elements = document.getElementsByName(name); - var highlighter = null; - var registered = new Object(); - var propertyName = 'value'; - - function FindValue() - { - var a = arguments; - - for(var i = 0; i < a.length; i++) - if(a[i] != null && ((typeof(a[i]) == 'string' && a[i] != '') || (typeof(a[i]) == 'object' && a[i].value != ''))) - return a[i]; - - return null; - } - - if(elements == null) - { - return; - } - - // if showGutter isn't set, default to TRUE - if(showGutter == null) - { - showGutter = true; - } - - // if showControls isn't set, default to TRUE - if(showControls == null) - { - showControls = true; - } - - // register all brushes - for(var brush in dp.sh.Brushes) - { - var aliases = dp.sh.Brushes[brush].Aliases; - - if(aliases == null) - { - continue; - } - - for(var i = 0; i < aliases.length; i++) - { - registered[aliases[i]] = brush; - } - } - - for(var i = 0; i < elements.length; i++) - { - var element = elements[i]; - var language = FindValue(element.attributes['class'], element.className, element.attributes['language'], element.language); - - if(language == null) - continue; - - if(language.value) - language = language.value; - - language = (language + '').toLowerCase(); - - if(registered[language] == null) - { - continue; - } - - // instantiate a brush - highlighter = new dp.sh.Brushes[registered[language]](); - - // hide the original element - element.style.display = 'none'; - - highlighter.addGutter = showGutter; - highlighter.addControls = showControls; - highlighter.Highlight(element[propertyName]); - - // place the result table inside a div - var div = document.createElement('div'); - - div.className = 'dp-highlighter'; - div.appendChild(highlighter.table); - - element.parentNode.insertBefore(div, element); - } -} diff --git a/usr/local/www/code-syntax-highlighter/shCore.uncompressed.js b/usr/local/www/code-syntax-highlighter/shCore.uncompressed.js deleted file mode 100644 index 8d92721..0000000 --- a/usr/local/www/code-syntax-highlighter/shCore.uncompressed.js +++ /dev/null @@ -1,636 +0,0 @@ -/** - * Code Syntax Highlighter. - * Version 1.3.0 - * Copyright (C) 2004 Alex Gorbatchev. - * http://www.dreamprojections.com/syntaxhighlighter/ - * - * This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General - * Public License as published by the Free Software Foundation; either version 2.1 of the License, or (at your option) - * any later version. - * - * This library is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied - * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more - * details. - * - * You should have received a copy of the GNU Lesser General Public License along with this library; if not, write to - * the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - */ - -// -// create namespaces -// -var dp = { - sh : - { - Toolbar : {}, - Utils : {}, - RegexLib: {}, - Brushes : {}, - Strings : {}, - Version : '1.4.1' - } -}; - -dp.sh.Strings = { - AboutDialog : 'About...

dp.SyntaxHighlighter

Version: {V}

http://www.dreamprojections.com/SyntaxHighlighter

©2004-2005 Alex Gorbatchev. All right reserved.
' -}; - -dp.SyntaxHighlighter = dp.sh; - -// -// Toolbar functions -// - -dp.sh.Toolbar.Commands = { - ExpandSource: { - label: '+ expand source', - check: function(highlighter) { return highlighter.collapse; }, - func: function(sender, highlighter) - { - sender.parentNode.removeChild(sender); - highlighter.div.className = highlighter.div.className.replace('collapsed', ''); - } - }, - - // opens a new windows and puts the original unformatted source code inside. - ViewSource: { - label: 'view plain', - func: function(sender, highlighter) - { - var code = highlighter.originalCode.replace(/' + code + ''); - wnd.document.close(); - } - }, - - // copies the original source code in to the clipboard (IE only) - CopyToClipboard: { - label: 'copy to clipboard', - check: function() { return window.clipboardData != null; }, - func: function(sender, highlighter) - { - window.clipboardData.setData('text', highlighter.originalCode); - alert('The code is in your clipboard now'); - } - }, - - // creates an invisible iframe, puts the original source code inside and prints it - PrintSource: { - label: 'print', - func: function(sender, highlighter) - { - var iframe = document.createElement('IFRAME'); - var doc = null; - - // this hides the iframe - iframe.style.cssText = 'position:absolute;width:0px;height:0px;left:-500px;top:-500px;'; - - document.body.appendChild(iframe); - doc = iframe.contentWindow.document; - - dp.sh.Utils.CopyStyles(doc, window.document); - doc.write('
' + highlighter.div.innerHTML + '
'); - doc.close(); - - iframe.contentWindow.focus(); - iframe.contentWindow.print(); - - alert('Printing...'); - - document.body.removeChild(iframe); - } - }, - - About: { - label: '?', - func: function(highlighter) - { - var wnd = window.open('', '_blank', 'dialog,width=300,height=150,scrollbars=0'); - var doc = wnd.document; - - dp.sh.Utils.CopyStyles(doc, window.document); - - doc.write(dp.sh.Strings.AboutDialog.replace('{V}', dp.sh.Version)); - doc.close(); - wnd.focus(); - } - } -}; - -// creates a
with all toolbar links -dp.sh.Toolbar.Create = function(highlighter) -{ - var div = document.createElement('div'); - - div.className = 'tools'; - - for(var name in dp.sh.Toolbar.Commands) - { - var cmd = dp.sh.Toolbar.Commands[name]; - - if(cmd.check != null && !cmd.check(highlighter)) - continue; - - div.innerHTML += '' + cmd.label + ''; - } - - return div; -} - -// executes toolbar command by name -dp.sh.Toolbar.Command = function(name, sender) -{ - var n = sender; - - while(n != null && n.className.indexOf('dp-highlighter') == -1) - n = n.parentNode; - - if(n != null) - dp.sh.Toolbar.Commands[name].func(sender, n.highlighter); -} - -// copies all from 'target' window to 'dest' -dp.sh.Utils.CopyStyles = function(destDoc, sourceDoc) -{ - var links = sourceDoc.getElementsByTagName('link'); - - for(var i = 0; i < links.length; i++) - if(links[i].rel.toLowerCase() == 'stylesheet') - destDoc.write(''); -} - -// -// Common reusable regular expressions -// -dp.sh.RegexLib = { - MultiLineCComments : new RegExp('/\\*[\\s\\S]*?\\*/', 'gm'), - SingleLineCComments : new RegExp('//.*$', 'gm'), - SingleLinePerlComments : new RegExp('#.*$', 'gm'), - DoubleQuotedString : new RegExp('"(?:\\.|(\\\\\\")|[^\\""])*"','g'), - SingleQuotedString : new RegExp("'(?:\\.|(\\\\\\')|[^\\''])*'", 'g') -}; - -// -// Match object -// -dp.sh.Match = function(value, index, css) -{ - this.value = value; - this.index = index; - this.length = value.length; - this.css = css; -} - -// -// Highlighter object -// -dp.sh.Highlighter = function() -{ - this.noGutter = false; - this.addControls = true; - this.collapse = false; - this.tabsToSpaces = true; - this.wrapColumn = 80; - this.showColumns = true; -} - -// static callback for the match sorting -dp.sh.Highlighter.SortCallback = function(m1, m2) -{ - // sort matches by index first - if(m1.index < m2.index) - return -1; - else if(m1.index > m2.index) - return 1; - else - { - // if index is the same, sort by length - if(m1.length < m2.length) - return -1; - else if(m1.length > m2.length) - return 1; - } - return 0; -} - -dp.sh.Highlighter.prototype.createElement = function(name) -{ - var result = document.createElement(name); - result.highlighter = this; - return result; -} - -// gets a list of all matches for a given regular expression -dp.sh.Highlighter.prototype.GetMatches = function(regex, css) -{ - var index = 0; - var match = null; - - while((match = regex.exec(this.code)) != null) - this.matches[this.matches.length] = new dp.sh.Match(match[0], match.index, css); -} - -dp.sh.Highlighter.prototype.AddBit = function(str, css) -{ - if(str == null || str.length == 0) - return; - - var span = this.createElement('span'); - - str = str.replace(/&/g, '&'); - str = str.replace(/ /g, ' '); - str = str.replace(/'); - - // when adding a piece of code, check to see if it has line breaks in it - // and if it does, wrap individual line breaks with span tags - if(css != null) - { - var regex = new RegExp('
', 'gi'); - - if(regex.test(str)) - { - var lines = str.split(' 
'); - - str = ''; - - for(var i = 0; i < lines.length; i++) - { - span = this.createElement('span'); - span.className = css; - span.innerHTML = lines[i]; - - this.div.appendChild(span); - - // don't add a
for the last line - if(i + 1 < lines.length) - this.div.appendChild(this.createElement('br')); - } - } - else - { - span.className = css; - span.innerHTML = str; - this.div.appendChild(span); - } - } - else - { - span.innerHTML = str; - this.div.appendChild(span); - } -} - -// checks if one match is inside any other match -dp.sh.Highlighter.prototype.IsInside = function(match) -{ - if(match == null || match.length == 0) - return false; - - for(var i = 0; i < this.matches.length; i++) - { - var c = this.matches[i]; - - if(c == null) - continue; - - if((match.index > c.index) && (match.index < c.index + c.length)) - return true; - } - - return false; -} - -dp.sh.Highlighter.prototype.ProcessRegexList = function() -{ - for(var i = 0; i < this.regexList.length; i++) - this.GetMatches(this.regexList[i].regex, this.regexList[i].css); -} - -dp.sh.Highlighter.prototype.ProcessSmartTabs = function(code) -{ - var lines = code.split('\n'); - var result = ''; - var tabSize = 4; - var tab = '\t'; - - // This function inserts specified amount of spaces in the string - // where a tab is while removing that given tab. - function InsertSpaces(line, pos, count) - { - var left = line.substr(0, pos); - var right = line.substr(pos + 1, line.length); // pos + 1 will get rid of the tab - var spaces = ''; - - for(var i = 0; i < count; i++) - spaces += ' '; - - return left + spaces + right; - } - - // This function process one line for 'smart tabs' - function ProcessLine(line, tabSize) - { - if(line.indexOf(tab) == -1) - return line; - - var pos = 0; - - while((pos = line.indexOf(tab)) != -1) - { - // This is pretty much all there is to the 'smart tabs' logic. - // Based on the position within the line and size of a tab, - // calculate the amount of spaces we need to insert. - var spaces = tabSize - pos % tabSize; - - line = InsertSpaces(line, pos, spaces); - } - - return line; - } - - // Go through all the lines and do the 'smart tabs' magic. - for(var i = 0; i < lines.length; i++) - result += ProcessLine(lines[i], tabSize) + '\n'; - - return result; -} - -dp.sh.Highlighter.prototype.SwitchToList = function() -{ - // thanks to Lachlan Donald from SitePoint.com for this
tag fix. - var html = this.div.innerHTML.replace(/<(br)\/?>/gi, '\n'); - var lines = html.split('\n'); - - if(this.addControls == true) - this.bar.appendChild(dp.sh.Toolbar.Create(this)); - - // add columns ruler - if(this.showColumns) - { - var div = this.createElement('div'); - var columns = this.createElement('div'); - var showEvery = 10; - var i = 1; - - while(i <= 150) - { - if(i % showEvery == 0) - { - div.innerHTML += i; - i += (i + '').length; - } - else - { - div.innerHTML += '·'; - i++; - } - } - - columns.className = 'columns'; - columns.appendChild(div); - this.bar.appendChild(columns); - } - - for(var i = 0, lineIndex = this.firstLine; i < lines.length - 1; i++, lineIndex++) - { - var li = this.createElement('li'); - var span = this.createElement('span'); - - // uses .line1 and .line2 css styles for alternating lines - li.className = (i % 2 == 0) ? 'alt' : ''; - span.innerHTML = lines[i] + ' '; - - li.appendChild(span); - this.ol.appendChild(li); - } - - this.div.innerHTML = ''; -} - -dp.sh.Highlighter.prototype.Highlight = function(code) -{ - function Trim(str) - { - return str.replace(/^\s*(.*?)[\s\n]*$/g, '$1'); - } - - function Chop(str) - { - return str.replace(/\n*$/, '').replace(/^\n*/, ''); - } - - function Unindent(str) - { - var lines = str.split('\n'); - var indents = new Array(); - var regex = new RegExp('^\\s*', 'g'); - var min = 1000; - - // go through every line and check for common number of indents - for(var i = 0; i < lines.length && min > 0; i++) - { - if(Trim(lines[i]).length == 0) - continue; - - var matches = regex.exec(lines[i]); - - if(matches != null && matches.length > 0) - min = Math.min(matches[0].length, min); - } - - // trim minimum common number of white space from the begining of every line - if(min > 0) - for(var i = 0; i < lines.length; i++) - lines[i] = lines[i].substr(min); - - return lines.join('\n'); - } - - // This function returns a portions of the string from pos1 to pos2 inclusive - function Copy(string, pos1, pos2) - { - return string.substr(pos1, pos2 - pos1); - } - - var pos = 0; - - this.originalCode = code; - this.code = Chop(Unindent(code)); - this.div = this.createElement('div'); - this.bar = this.createElement('div'); - this.ol = this.createElement('ol'); - this.matches = new Array(); - - this.div.className = 'dp-highlighter'; - this.div.highlighter = this; - - this.bar.className = 'bar'; - - // set the first line - this.ol.start = this.firstLine; - - if(this.CssClass != null) - this.ol.className = this.CssClass; - - if(this.collapse) - this.div.className += ' collapsed'; - - if(this.noGutter) - this.div.className += ' nogutter'; - - // replace tabs with spaces - if(this.tabsToSpaces == true) - this.code = this.ProcessSmartTabs(this.code); - - this.ProcessRegexList(); - - // if no matches found, add entire code as plain text - if(this.matches.length == 0) - { - this.AddBit(this.code, null); - this.SwitchToList(); - this.div.appendChild(this.ol); - return; - } - - // sort the matches - this.matches = this.matches.sort(dp.sh.Highlighter.SortCallback); - - // The following loop checks to see if any of the matches are inside - // of other matches. This process would get rid of highligted strings - // inside comments, keywords inside strings and so on. - for(var i = 0; i < this.matches.length; i++) - if(this.IsInside(this.matches[i])) - this.matches[i] = null; - - // Finally, go through the final list of matches and pull the all - // together adding everything in between that isn't a match. - for(var i = 0; i < this.matches.length; i++) - { - var match = this.matches[i]; - - if(match == null || match.length == 0) - continue; - - this.AddBit(Copy(this.code, pos, match.index), null); - this.AddBit(match.value, match.css); - - pos = match.index + match.length; - } - - this.AddBit(this.code.substr(pos), null); - - this.SwitchToList(); - this.div.appendChild(this.bar); - this.div.appendChild(this.ol); -} - -dp.sh.Highlighter.prototype.GetKeywords = function(str) -{ - return '\\b' + str.replace(/ /g, '\\b|\\b') + '\\b'; -} - -// highlightes all elements identified by name and gets source code from specified property -dp.sh.HighlightAll = function(name, showGutter /* optional */, showControls /* optional */, collapseAll /* optional */, firstLine /* optional */, showColumns /* optional */) -{ - function FindValue() - { - var a = arguments; - - for(var i = 0; i < a.length; i++) - { - if(a[i] == null) - continue; - - if(typeof(a[i]) == 'string' && a[i] != '') - return a[i] + ''; - - if(typeof(a[i]) == 'object' && a[i].value != '') - return a[i].value + ''; - } - - return null; - } - - function IsOptionSet(value, list) - { - for(var i = 0; i < list.length; i++) - if(list[i] == value) - return true; - - return false; - } - - function GetOptionValue(name, list, defaultValue) - { - var regex = new RegExp('^' + name + '\\[(\\w+)\\]$', 'gi'); - var matches = null; - - for(var i = 0; i < list.length; i++) - if((matches = regex.exec(list[i])) != null) - return matches[1]; - - return defaultValue; - } - - var elements = document.getElementsByName(name); - var highlighter = null; - var registered = new Object(); - var propertyName = 'value'; - - // if no code blocks found, leave - if(elements == null) - return; - - // register all brushes - for(var brush in dp.sh.Brushes) - { - var aliases = dp.sh.Brushes[brush].Aliases; - - if(aliases == null) - continue; - - for(var i = 0; i < aliases.length; i++) - registered[aliases[i]] = brush; - } - - for(var i = 0; i < elements.length; i++) - { - var element = elements[i]; - var options = FindValue( - element.attributes['class'], element.className, - element.attributes['language'], element.language - ); - var language = ''; - - if(options == null) - continue; - - options = options.split(':'); - - language = options[0].toLowerCase(); - - if(registered[language] == null) - continue; - - // instantiate a brush - highlighter = new dp.sh.Brushes[registered[language]](); - - // hide the original element - element.style.display = 'none'; - - highlighter.noGutter = (showGutter == null) ? IsOptionSet('nogutter', options) : !showGutter; - highlighter.addControls = (showControls == null) ? !IsOptionSet('nocontrols', options) : showControls; - highlighter.collapse = (collapseAll == null) ? IsOptionSet('collapse', options) : collapseAll; - highlighter.showColumns = (showColumns == null) ? IsOptionSet('showcolumns', options) : showColumns; - - // first line idea comes from Andrew Collington, thanks! - highlighter.firstLine = (firstLine == null) ? parseInt(GetOptionValue('firstline', options, 1)) : firstLine; - - highlighter.Highlight(element[propertyName]); - - element.parentNode.insertBefore(highlighter.div, element); - } -} diff --git a/usr/local/www/pkg_mgr.php b/usr/local/www/pkg_mgr.php index 184dded..f1b1a0d 100644 --- a/usr/local/www/pkg_mgr.php +++ b/usr/local/www/pkg_mgr.php @@ -230,13 +230,9 @@ if(!$pkg_info || !is_array($pkg_keys)):?> - " href="pkg_mgr_install.php?id="> - - + " href="pkg_mgr_install.php?id=" class="btn btn-success">install - " href=""> - - + " href="" class="btn btn-default">info diff --git a/usr/local/www/pkg_mgr_installed.php b/usr/local/www/pkg_mgr_installed.php index 8af8443..c0caec4 100644 --- a/usr/local/www/pkg_mgr_installed.php +++ b/usr/local/www/pkg_mgr_installed.php @@ -161,19 +161,11 @@ if(!is_array($config['installedpackages']['package'])):?> - - - - " href="pkg_mgr_install.php?mode=reinstallpkg&pkg="> - - - " href="pkg_mgr_install.php?mode=reinstallxml&pkg="> - - + remove + reinstall + - " href=""> - - + " href="" class="btn btn-default">info diff --git a/usr/local/www/system.php b/usr/local/www/system.php index 820308a..9326db5 100644 --- a/usr/local/www/system.php +++ b/usr/local/www/system.php @@ -317,7 +317,7 @@ if ($savemsg)
-

+

@@ -374,9 +374,10 @@ if ($savemsg)
- +
/> +
- +
/> + @@ -402,7 +404,7 @@ if ($savemsg)
-