From 1ab2471735faa34cf5c6206b4b6c1155995d6cb8 Mon Sep 17 00:00:00 2001 From: Art Cancro Date: Fri, 24 Sep 2010 22:52:50 -0400 Subject: [PATCH] Removed the Nifty Corners library and all references to its methods. Don't worry, these styles will be back soon using CSS 3. --- webcit/COPYING | 5 +- webcit/README.txt | 4 - webcit/debian/copyright | 7 +- webcit/static/niftycube.js | 298 ------------------ webcit/static/styles/niftyCorners.css | 37 --- .../static/t/aide/display_serverrestart.html | 2 - .../t/aide/display_serverrestart_page_do.html | 2 - webcit/static/t/head.html | 2 - webcit/static/t/trailing.html | 5 - webcit/tabs.c | 19 +- 10 files changed, 6 insertions(+), 375 deletions(-) delete mode 100644 webcit/static/niftycube.js delete mode 100644 webcit/static/styles/niftyCorners.css diff --git a/webcit/COPYING b/webcit/COPYING index 8e9c34fec..d7c4835c6 100644 --- a/webcit/COPYING +++ b/webcit/COPYING @@ -1,10 +1,10 @@ Webcit Core is Copyright by the Citadel Development Team 1998 - 2009 Webcit contains components under different Licenses, here their authors and list: -Scriptaculus: Copyright (c) 2005-2007 +Scriptaculous:Copyright (c) 2005-2007 Thomas Fuchs, Marty Haught, Ivan Krstic, Jon Tirsen, Sammi Williams (http://script.aculo.us, http://mir.aculo.us, http://blogs.law.harvard.edu/ivan, - http://www.tirsen.com, http://www.oriontransfer.co.nz) + http://www.tirsen.com, http://www.oriontransfer.co.nz) MIT-style license. PrototypeJS: Copyright (c) 2005-2008 Sam Stephenson; http://www.prototypejs.org/; MIT License (http://dev.rubyonrails.org/browser/spinoffs/prototype/trunk/LICENSE?format=raw) @@ -13,7 +13,6 @@ strcmp: http://kevin.vanzonneveld.net; original by: Waldo Malqui Silva input by: DatePicker: widget using Prototype and Scriptaculous. (c) 2007 Mathieu Jondet Eulerian Technologies DatePicker is freely distributable under the same terms as Prototype. -> NanoTree: Martin Mouritzen. (martin@nano.dk) LGPL V3 -Nifty Corners Cube: Alessandro Fulciniti (a.fulciniti@html.it); GPV V2 or Later Bubble Tooltips: Alessandro Fulciniti (http://web-graphics.com) Public Domain, GPL V3 by Art Cancro StdExt: Copyright (c) 2005 Michael Schuerig http://www.schuerig.de/michael/javascript/stdext.js LGPL V2.1 or later TinyMCE: Moxiecode tinymce.org LGPL V2.1 or later diff --git a/webcit/README.txt b/webcit/README.txt index a9eae52bd..cec830c44 100644 --- a/webcit/README.txt +++ b/webcit/README.txt @@ -31,10 +31,6 @@ is licensed to you under the terms of the GNU Lesser General Public License. - WebCit bundles the Nifty Corners library, written by Alessandro Fulciniti - [http://cerca.html.it/cgi-bin/cerca.cgi?q=nifty+corners]. This component - is licensed to you under the terms of the GNU General Public License. - One or more icons are from Milosz Wlazlo [http://miloszwl.deviantart.com] whose license explicitly allows inclusion in open source projects on the condition of this attribution. diff --git a/webcit/debian/copyright b/webcit/debian/copyright index 8b227b7b9..6776133ec 100644 --- a/webcit/debian/copyright +++ b/webcit/debian/copyright @@ -25,9 +25,6 @@ Copyright for script.aculo.us JavaScript library : Copyright for TinyMCE : (C) 2003-2006 Moxiecode Systems AB -Copyitght for Nifty Corners Cube : - (C) 2005-2006 Alessandro Fulciniti - Prototype JavaScript Framework license: Permission is hereby granted, free of charge, to any person obtaining a copy @@ -85,11 +82,11 @@ TinyMCE license: On Debian systems, the complete text of the GNU Lesser General Public License can be found in `/usr/share/common-licenses/LGPL'. -Nifty Corners Cube and WebCit license: +WebCit license: This package 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 + the Free Software Foundation; either version 3 of the License, or (at your option) any later version. This package is distributed in the hope that it will be useful, diff --git a/webcit/static/niftycube.js b/webcit/static/niftycube.js deleted file mode 100644 index 06734741f..000000000 --- a/webcit/static/niftycube.js +++ /dev/null @@ -1,298 +0,0 @@ -/* Nifty Corners Cube - rounded corners with CSS and Javascript -Copyright 2006 Alessandro Fulciniti (a.fulciniti@html.it) - -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., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA -*/ - -var niftyOk=(document.getElementById && document.createElement && Array.prototype.push); -var niftyCss=false; - -String.prototype.find=function(what){ -return(this.indexOf(what)>=0 ? true : false); -} - -var oldonload=window.onload; -if(typeof(NiftyLoad)!='function') NiftyLoad=function(){}; -if(typeof(oldonload)=='function') - window.onload=function(){oldonload();AddCss();NiftyLoad()}; -else window.onload=function(){AddCss();NiftyLoad()}; - -function AddCss(){ -niftyCss=true; -var l=CreateEl("link"); -l.setAttribute("type","text/css"); -l.setAttribute("rel","stylesheet"); -l.setAttribute("href","static/styles/niftyCorners.css"); -l.setAttribute("media","screen"); -document.getElementsByTagName("head")[0].appendChild(l); -} - -function Nifty(selector,options){ -if(niftyOk==false) return; -if(niftyCss==false) AddCss(); -var i,v=selector.split(","),h=0; -if(options==null) options=""; -if(options.find("fixed-height")) - h=getElementsBySelector(v[0])[0].offsetHeight; -for(i=0;i0;i--) - d.appendChild(CreateStrip(i,side,color,border,btype)); -el.style.paddingBottom=0; -el.appendChild(d); -} - -function CreateStrip(index,side,color,border,btype){ -var x=CreateEl("b"); -x.className=btype+index; -x.style.backgroundColor=color; -x.style.borderColor=border; -if(side=="left"){ - x.style.borderRightWidth="0"; - x.style.marginRight="0"; - } -else if(side=="right"){ - x.style.borderLeftWidth="0"; - x.style.marginLeft="0"; - } -return(x); -} - -function CreateEl(x){ -return(document.createElement(x)); -} - -function FixIE(el){ -if(el.currentStyle!=null && el.currentStyle.hasLayout!=null && el.currentStyle.hasLayout==false) - el.style.display="inline-block"; -} - -function SameHeight(selector,maxh){ -var i,v=selector.split(","),t,j,els=[],gap; -for(i=0;imaxh) maxh=els[i].offsetHeight; - els[i].style.height="auto"; - } -for(i=0;i0){ - t=CreateEl("b");t.className="niftyfill";t.style.height=gap+"px"; - nc=els[i].lastChild; - if(nc.className=="niftycorners") - els[i].insertBefore(t,nc); - else els[i].appendChild(t); - } - } -} - -function getElementsBySelector(selector){ -var i,j,selid="",selclass="",tag=selector,tag2="",v2,k,f,a,s=[],objlist=[],c; -if(selector.find("#")){ //id selector like "tag#id" - if(selector.find(" ")){ //descendant selector like "tag#id tag" - s=selector.split(" "); - var fs=s[0].split("#"); - if(fs.length==1) return(objlist); - f=document.getElementById(fs[1]); - if(f){ - v=f.getElementsByTagName(s[1]); - for(i=0;i - - - diff --git a/webcit/static/t/aide/display_serverrestart_page_do.html b/webcit/static/t/aide/display_serverrestart_page_do.html index 235d1f368..12053d3ed 100644 --- a/webcit/static/t/aide/display_serverrestart_page_do.html +++ b/webcit/static/t/aide/display_serverrestart_page_do.html @@ -5,14 +5,12 @@ <?CURRENT_USER> - <?SERV:HUMANNODE> - - diff --git a/webcit/static/t/head.html b/webcit/static/t/head.html index fc450450f..85b398bf5 100644 --- a/webcit/static/t/head.html +++ b/webcit/static/t/head.html @@ -5,7 +5,6 @@ <?CURRENT_USER> - <?SERV:HUMANNODE> - @@ -19,7 +18,6 @@ - diff --git a/webcit/static/t/trailing.html b/webcit/static/t/trailing.html index f5c32b746..c4eb91f1d 100644 --- a/webcit/static/t/trailing.html +++ b/webcit/static/t/trailing.html @@ -2,11 +2,6 @@ diff --git a/webcit/tabs.c b/webcit/tabs.c index 0a31a0d96..a81c41432 100644 --- a/webcit/tabs.c +++ b/webcit/tabs.c @@ -82,13 +82,6 @@ void end_tab(int tabnum, int num_tabs) { else { wc_printf("\n"); wc_printf("\n", tabnum, num_tabs); - - if (tabnum == num_tabs-1) { - wc_printf("" - ); - } } } @@ -205,16 +198,8 @@ void StrEndTab(StrBuf *Target, int tabnum, int num_tabs) { StrBufAppendPrintf( Target, "\n", - "\n", tabnum, num_tabs); - - if (tabnum == num_tabs-1) { - StrBufAppendBufPlain( - Target, - HKEY( - ""), 0); - } + "\n", tabnum, num_tabs + ); } if (HAVEBSTR("last_tabsel")) { -- 2.30.2