← Back to team overview

dhis2-devs team mailing list archive

  1. dhis2-devs team
  2. Mailing list archive
  3. Message #14369

[Branch ~dhis2-devs-core/dhis2/trunk] Rev 4864: Removed the thickbox and cluetip javascript plugins which are now obsolete

  Thread Previous • Date Previous • • Thread Next 
------------------------------------------------------------
revno: 4864
committer: Lars Helge Overland <larshelge@xxxxxxxxx>
branch nick: dhis2
timestamp: Thu 2011-10-06 17:53:59 +0200
message:
  Removed the thickbox and cluetip javascript plugins which are now obsolete
removed:
  dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/javascripts/jQuery/ui/css/jquery.cluetip.css
  dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/javascripts/jQuery/ui/css/ui.thickbox.css
  dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/javascripts/jQuery/ui/jquery.cluetip.min.js
  dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/javascripts/jQuery/ui/ui.thickbox.min.js
modified:
  dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/main.vm
  dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/popup.vm


--
lp:dhis2
https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk

Your team DHIS 2 developers is subscribed to branch lp:dhis2.
To unsubscribe from this branch go to https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk/+edit-subscription

=== removed file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/javascripts/jQuery/ui/css/jquery.cluetip.css'
--- dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/javascripts/jQuery/ui/css/jquery.cluetip.css	2011-05-31 17:59:45 +0000
+++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/javascripts/jQuery/ui/css/jquery.cluetip.css	1970-01-01 00:00:00 +0000
@@ -1,229 +0,0 @@
-/* global */
-div.ui-cluetip {
-  font-size: 1em;
-}
-.ui-cluetip-header,
-.ui-cluetip-content {
-  padding: 12px;
-}
-.ui-cluetip-header {
-  font-size: 1em;
-  margin: 0;
-  overflow: hidden;
-}
-
-#cluetip-title #cluetip-close {
-  float: right;
-  position: relative;
-}
-#cluetip-close img {
-  border: 0;
-}
-
-#cluetip-waitimage {
-  width: 43px;
-  height: 11px;
-  position: absolute;
-  background-image: url(images/wait.gif);
-}
-.cluetip-arrows {
-  display: none;
-  position: absolute;
-  top: 0;
-  left: -11px;
-  width: 11px;
-  height: 22px;
-  background-repeat: no-repeat;
-  background-position: 0 0;
-  border-width: 0;
-}
-#cluetip-extra {
-  display: none;
-}
-
-/***************************************
-   =cluetipClass: 'default'
--------------------------------------- */
-
-.cluetip-default {
-  background-color: #d9d9c2;
-}
-.cluetip-default .ui-cluetip-header {
-  background-color: #87876a;
-}
-
-
-/*
-.cluetip-default #cluetip-outer {
-  position: relative;
-  margin: 0;
-  background-color: #d9d9c2;
-}
-.cluetip-default h3#cluetip-title {
-  margin: 0 0 5px;
-  padding: 8px 10px 4px;
-  font-size: 1.1em;
-  font-weight: normal;
-  background-color: #87876a;
-  color: #fff;
-}
-.cluetip-default #cluetip-title a {
-  color: #d9d9c2;
-  font-size: 0.95em;
-}
-.cluetip-default #cluetip-inner {
-  padding: 10px;
-}
-.cluetip-default div#cluetip-close {
-  text-align: right;
-  margin: 0 5px 5px;
-  color: #900;
-}
-*/
-/* default arrows */
-div.cluetip-default .cluetip-arrows {
-  border-width: 0;
-  background: transparent none;
-}
-div.clue-right-default .cluetip-arrows {
-  background-image: url(images/darrowleft.gif);
-}
-div.clue-left-default .cluetip-arrows {
-  background-image: url(images/darrowright.gif);
-  left: 100%;
-  margin-right: -11px;
-}
-div.clue-top-default .cluetip-arrows {
-  background-image: url(images/darrowdown.gif);
-  top: 100%;
-  left: 50%;
-  margin-left: -11px;
-  width: 22px;
-  height: 11px;
-}
-div.clue-bottom-default .cluetip-arrows {
-  background-image: url(images/darrowup.gif);
-  top: -11px;
-  left: 50%;
-  margin-left: -11px;
-  width: 22px;
-  height: 11px;
-}
-
-/***************************************
-   =cluetipClass: 'jtip'
--------------------------------------- */
-.cluetip-jtip {
-  background-color: #fff;
-}
-.cluetip-jtip #cluetip-outer {
-  border: 2px solid #ccc;
-  position: relative;
-}
-
-.cluetip-jtip #cluetip-inner {
-  padding: 5px;
-  display: inline-block;
-}
-.cluetip-jtip div#cluetip-close {
-  text-align: right;
-  margin: 0 5px 0;
-  color: #900;
-}
-
-.cluetip-jtip .ui-cluetip-header {
-  background-color: #ccc;
-  padding: 6px;
-/*  margin-bottom: 1em;*/
-}
-
-/* jtip arrows */
-div.cluetip-jtip .cluetip-arrows {
-  border-width: 0;
-  background: transparent none;
-}
-div.clue-right-jtip .cluetip-arrows {
-  background-image: url(images/arrowleft.gif);
-}
-div.clue-left-jtip .cluetip-arrows {
-  background-image: url(images/arrowright.gif);
-  left: 100%;
-  margin-right: -11px;
-}
-div.clue-top-jtip .cluetip-arrows {
-  background-image: url(images/arrowdown.gif);
-  top: 100%;
-  left: 50%;
-  width: 22px;
-  height: 11px;
-  margin-left: -11px;
-}
-div.clue-bottom-jtip .cluetip-arrows {
-  background-image: url(images/arrowup.gif);
-  top: -11px;
-  left: 50%;
-  width: 22px;
-  height: 11px;
-  margin-left: -11px;
-}
-
-/***************************************
-   =cluetipClass: 'rounded'
--------------------------------------- */
-.cluetip-rounded {
-  -webkit-border-radius: 6px;
-  -moz-border-radius: 6px;
-  border-radius: 6px;
-  background-color: #fff;
-  border: 1px solid #ccc;
-}
-.cluetip-rounded  .cluetip-arrows {
-  border-color: #ccc;
-}
-
-/* need to be more specific here to override ThemeRoller defaults */
-div.cluetip-rounded  .cluetip-arrows {
-  font-size: 0;
-  line-height: 0%;
-  width: 0;
-  height: 0;
-  border-style: solid;
-  background: transparent none;
-}
-div.clue-right-rounded .cluetip-arrows {
-  border-width: 11px 11px 11px 0;
-  border-top-color: transparent;
-  border-bottom-color: transparent;
-  border-left-color: transparent;
-}
-div.clue-left-rounded .cluetip-arrows {
-  left: 100%;
-  margin-right: -11px;
-  border-width: 11px 0 11px 11px;
-  border-top-color: transparent;
-  border-right-color: transparent;
-  border-bottom-color: transparent;
-
-}
-div.clue-top-rounded .cluetip-arrows {
-  top: 100%;
-  left: 50%;
-  border-width: 11px 11px 0 11px;
-  border-right-color: transparent;
-  border-bottom-color: transparent;
-  border-left-color: transparent;
-}
-.clue-bottom-rounded .cluetip-arrows {
-  top: -11px;
-  left: 50%;
-  border-width: 0 11px 11px 11px;
-  border-top-color: transparent;
-  border-right-color: transparent;
-  border-left-color: transparent;
-
-}
-/* stupid IE6 HasLayout hack */
-.cluetip-rounded #cluetip-title,
-.cluetip-rounded #cluetip-inner {
-  zoom: 1;
-}
\ No newline at end of file

=== removed file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/javascripts/jQuery/ui/css/ui.thickbox.css'
--- dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/javascripts/jQuery/ui/css/ui.thickbox.css	2011-05-12 11:16:00 +0000
+++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/javascripts/jQuery/ui/css/ui.thickbox.css	1970-01-01 00:00:00 +0000
@@ -1,164 +0,0 @@
-/* ----------------------------------------------------------------------------------------------------------------*/
-/* ---------->>> global settings needed for thickbox <<<-----------------------------------------------------------*/
-/* ----------------------------------------------------------------------------------------------------------------*/
-*
-#TB_window , #TB_overlay{padding: 0; margin: 0;}
-
-/* ----------------------------------------------------------------------------------------------------------------*/
-/* ---------->>> thickbox specific link and font settings <<<------------------------------------------------------*/
-/* ----------------------------------------------------------------------------------------------------------------*/
-#TB_window {
-	font: 12px Arial, Helvetica, sans-serif;
-	color: #333333;
-}
-
-#TB_secondLine {
-	font: 10px Arial, Helvetica, sans-serif;
-	color:#666666;
-}
-
-#TB_window a:link {color: #666666;}
-#TB_window a:visited {color: #666666;}
-#TB_window a:hover {color: #000;}
-#TB_window a:active {color: #666666;}
-#TB_window a:focus{color: #666666;}
-
-/* ----------------------------------------------------------------------------------------------------------------*/
-/* ---------->>> thickbox settings <<<-----------------------------------------------------------------------------*/
-/* ----------------------------------------------------------------------------------------------------------------*/
-#TB_overlay {
-	position: fixed;
-	z-index:100;
-	top: 0px;
-	left: 0px;
-	height:100%;
-	width:100%;
-}
-
-.TB_overlayMacFFBGHack {background: url(macFFBgHack.png) repeat;}
-.TB_overlayBG {
-	background-color:#000;
-	filter:alpha(opacity=75);
-	-moz-opacity: 0.75;
-	opacity: 0.75;
-}
-
-* html #TB_overlay { /* ie6 hack */
-     position: absolute;
-     height: expression(document.body.scrollHeight > document.body.offsetHeight ? document.body.scrollHeight : document.body.offsetHeight + 'px');
-}
-
-#TB_window {
-	position: fixed;
-	background: #ffffff;
-	z-index: 102;
-	color:#000000;
-	display:none;
-	border: 4px solid #525252;
-	text-align:left;
-	top:50%;
-	left:50%;
-}
-
-* html #TB_window { /* ie6 hack */
-position: absolute;
-margin-top: expression(0 - parseInt(this.offsetHeight / 2) + (TBWindowMargin = document.documentElement && document.documentElement.scrollTop || document.body.scrollTop) + 'px');
-}
-
-#TB_window img#TB_Image {
-	display:block;
-	margin: 15px 0 0 15px;
-	border-right: 1px solid #ccc;
-	border-bottom: 1px solid #ccc;
-	border-top: 1px solid #666;
-	border-left: 1px solid #666;
-}
-
-#TB_caption{
-	height:25px;
-	padding:7px 30px 10px 25px;
-	float:left;
-}
-
-#TB_closeWindow{
-	height:25px;
-	padding:11px 25px 10px 0;
-	float:right;
-}
-
-#TB_closeAjaxWindow{
-	padding:7px 10px 5px 0;
-	margin-bottom:1px;
-	text-align:right;
-	float:right;
-}
-
-#TB_ajaxWindowTitle{
-	float:left;
-	padding:7px 0 5px 10px;
-	margin-bottom:1px;
-}
-
-#TB_title{
-	background-color:#e8e8e8;
-	height:27px;
-}
-
-#TB_ajaxContent{
-	clear:both;
-	padding:2px 15px 15px 15px;
-	overflow:auto;
-	text-align:left;
-	line-height:1.4em;
-}
-
-#TB_ajaxContent.TB_modal{
-	padding:15px;
-}
-
-#TB_ajaxContent p{
-	padding:5px 0px 5px 0px;
-}
-
-#TB_load{
-	position: fixed;
-	display:none;
-	height:13px;
-	width:208px;
-	z-index:103;
-	top: 50%;
-	left: 50%;
-	margin: -6px 0 0 -104px; /* -height/2 0 0 -width/2 */
-}
-
-* html #TB_load { /* ie6 hack */
-position: absolute;
-margin-top: expression(0 - parseInt(this.offsetHeight / 2) + (TBWindowMargin = document.documentElement && document.documentElement.scrollTop || document.body.scrollTop) + 'px');
-}
-
-#TB_HideSelect{
-	z-index:99;
-	position:fixed;
-	top: 0;
-	left: 0;
-	background-color:#fff;
-	border:none;
-	filter:alpha(opacity=0);
-	-moz-opacity: 0;
-	opacity: 0;
-	height:100%;
-	width:100%;
-}
-
-* html #TB_HideSelect { /* ie6 hack */
-     position: absolute;
-     height: expression(document.body.scrollHeight > document.body.offsetHeight ? document.body.scrollHeight : document.body.offsetHeight + 'px');
-}
-
-#TB_iframeContent{
-	clear:both;
-	border:none;
-	margin-bottom:-1px;
-	margin-top:1px;
-	_margin-bottom:1px;
-}

=== removed file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/javascripts/jQuery/ui/jquery.cluetip.min.js'
--- dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/javascripts/jQuery/ui/jquery.cluetip.min.js	2011-05-31 17:59:45 +0000
+++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/javascripts/jQuery/ui/jquery.cluetip.min.js	1970-01-01 00:00:00 +0000
@@ -1,33 +0,0 @@
-/*!
- * jQuery clueTip plugin v1.1.3
- *
- * Date: Mon Apr 11 20:31:15 2011 EDT
- * Requires: jQuery v1.3+
- *
- * Copyright 2010, Karl Swedberg
- * Dual licensed under the MIT and GPL licenses:
- * http://www.opensource.org/licenses/mit-license.php
- * http://www.gnu.org/licenses/gpl.html
- *
- * Full list of options/settings can be found at the bottom of this file and at http://plugins.learningjquery.com/cluetip/
- * Examples can be found at http://plugins.learningjquery.com/cluetip/demo/
- *
-*/
-(function(c){c.cluetip={version:"1.1.3",setup:{insertionType:"appendTo",insertionElement:"body"},defaults:{width:275,height:"auto",cluezIndex:97,positionBy:"auto",topOffset:15,leftOffset:15,local:false,localPrefix:null,localIdSuffix:null,hideLocal:true,attribute:"rel",titleAttribute:"title",splitTitle:"",escapeTitle:false,showTitle:true,cluetipClass:"default",hoverClass:"",waitImage:true,cursor:"help",arrows:false,dropShadow:true,dropShadowSteps:6,sticky:false,mouseOutClose:false,activation:"hover",
-clickThrough:true,tracking:false,delayedClose:0,closePosition:"top",closeText:"Close",truncate:0,fx:{open:"show",openSpeed:""},hoverIntent:{sensitivity:3,interval:50,timeout:0},onActivate:function(){return true},onShow:function(){},onHide:function(){},ajaxCache:true,ajaxProcess:function(i){return i=i.replace(/<(script|style|title)[^<]+<\/(script|style|title)>/gm,"").replace(/<(link|meta)[^>]+>/g,"")},ajaxSettings:{dataType:"html"},debug:false}};var e,g,Q,C,D,E,Y,F;c.fn.cluetip=function(i,m){function G(q,
-H){var h=q.dropShadow&&q.dropShadowSteps?+q.dropShadowSteps:0;if(c.support.boxShadow){var b=h===0?"0 0 ":"1px 1px ";c("#cluetip").css(c.support.boxShadow,b+h+"px rgba(0,0,0,0.5)");return false}b=c("#cluetip .cluetip-drop-shadow");if(h==b.length)return b;b.remove();b=[];for(var a=0;a<h;)b[a++]='<div style="top:'+a+"px;left:"+a+'px;"></div>';return H=c(b.join("")).css({position:"absolute",backgroundColor:"#000",zIndex:n-1,opacity:0.1}).addClass("cluetip-drop-shadow").prependTo("#cluetip")}if(typeof i==
-"object"){m=i;i=null}if(i=="destroy"){c(document).unbind(".cluetip");c("#cluetip").remove();c.removeData(this,"title");c.removeData(this,"cluetip");return this.unbind(".cluetip")}m=c.extend(true,{},c.cluetip.defaults,m||{});var I=/appendTo|prependTo|insertBefore|insertAfter/.test(m.insertionType)?m.insertionType:"appendTo",Z=m.insertionElement||"body";if(!c("#cluetip").length){c('<div id="cluetip"><div id="cluetip-outer" class="ui-cluetip-outer"><h3 id="cluetip-title" class="ui-widget-header ui-cluetip-header"></h3><div id="cluetip-inner" class="ui-widget-content ui-cluetip-content"></div></div><div id="cluetip-extra"></div><div id="cluetip-arrows" class="cluetip-arrows"></div></div>')[I](Z).hide();
-var n=+m.cluezIndex;e=c("#cluetip").css({position:"absolute"});Q=c("#cluetip-outer").css({position:"relative",zIndex:n});g=c("#cluetip-inner");C=c("#cluetip-title");D=c("#cluetip-arrows");E=c('<div id="cluetip-waitimage"></div>').css({position:"absolute"}).insertBefore(e).hide()}var R=(parseInt(e.css("paddingLeft"),10)||0)+(parseInt(e.css("paddingRight"),10)||0);this.each(function(q){function H(){return false}var h=this,b=c(this),a=c.extend(true,{},m,c.metadata?b.metadata():c.meta?b.data():{}),ca=
-false,y=false,da=0,k=b.attr(a.attribute),J=a.cluetipClass;n=+a.cluezIndex;b.data("cluetip",{title:h.title,zIndex:n});if(!k&&!a.splitTitle&&!i)return true;if(a.local&&a.localPrefix)k=a.localPrefix+k;a.local&&a.hideLocal&&k&&c(k+":first").hide();var r=parseInt(a.topOffset,10),x=parseInt(a.leftOffset,10),t,$,S=isNaN(parseInt(a.height,10))?"auto":/\D/g.test(a.height)?a.height:a.height+"px",T,u,s,K,U,aa=parseInt(a.width,10)||275,l=aa+R+a.dropShadowSteps,L=this.offsetWidth,v,j,o,z,A,p=a.attribute!="title"?
-b.attr(a.titleAttribute):"";if(a.splitTitle){if(p==undefined)p="";A=p.split(a.splitTitle);p=A.shift()}if(a.escapeTitle)p=p.replace(/&/g,"&amp;").replace(/>/g,"&gt;").replace(/</g,"&lt;");var W=function(d){if(a.onActivate(b)===false)return false;y=true;e.removeClass().css({width:aa});k==b.attr("href")&&b.css("cursor",a.cursor);a.hoverClass&&b.addClass(a.hoverClass);u=b.offset().top;v=b.offset().left;o=d.pageX;K=d.pageY;if(h.tagName.toLowerCase()!="area"){T=c(document).scrollTop();z=c(window).width()}if(a.positionBy==
-"fixed"){j=L+v+x;e.css({left:j})}else{j=L>v&&v>l||v+L+l+x>z?v-l-x:L+v+x;if(h.tagName.toLowerCase()=="area"||a.positionBy=="mouse"||L+l>z)if(o+20+l>z){e.addClass(" cluetip-"+J);j=o-l-x>=0?o-l-x-parseInt(e.css("marginLeft"),10)+parseInt(g.css("marginRight"),10):o-l/2}else j=o+x;var f=j<0?d.pageY+r:d.pageY;e.css({left:j>0&&a.positionBy!="bottomTop"?j:o+l/2>z?z/2-l/2:Math.max(o-l/2,0),zIndex:b.data("cluetip").zIndex});D.css({zIndex:b.data("cluetip").zIndex+1})}$=c(window).height();if(i){if(typeof i==
-"function")i=i.call(h);g.html(i);B(f)}else if(A){d=A.length;g.html(d?A[0]:"");if(d>1)for(var M=1;M<d;M++)g.append('<div class="split-body">'+A[M]+"</div>");B(f)}else if(!a.local&&k.indexOf("#")!==0)if(/\.(jpe?g|tiff?|gif|png)(?:\?.*)?$/i.test(k)){g.html('<img src="'+k+'" alt="'+p+'" />');B(f)}else{var N=a.ajaxSettings.beforeSend,ea=a.ajaxSettings.error,fa=a.ajaxSettings.success,ga=a.ajaxSettings.complete;d=c.extend(true,{},a.ajaxSettings,{cache:a.ajaxCache,url:k,beforeSend:function(w){N&&N.call(h,
-w,e,g);Q.children().empty();a.waitImage&&E.css({top:K+20,left:o+20,zIndex:b.data("cluetip").zIndex-1}).show()},error:function(w,O){if(y)ea?ea.call(h,w,O,e,g):g.html("<i>sorry, the contents could not be loaded</i>")},success:function(w,O){ca=a.ajaxProcess.call(h,w);if(y){fa&&fa.call(h,w,O,e,g);g.html(ca)}},complete:function(w,O){ga&&ga.call(h,w,O,e,g);var V=g[0].getElementsByTagName("img");F=V.length;for(var ba=0,ia=V.length;ba<ia;ba++)V[ba].complete&&F--;if(F&&!c.browser.opera)c(V).bind("load error",
-function(){F--;if(F<1){E.hide();y&&B(f)}});else{E.hide();y&&B(f)}}});c.ajax(d)}else if(a.local){d=c(k+(/#\S+$/.test(k)?"":":eq("+q+")")).clone(true).show();a.localIdSuffix&&d.attr("id",d[0].id+a.localIdSuffix);g.html(d);B(f)}},B=function(d){e.addClass("cluetip-"+J);if(a.truncate){var f=g.text().slice(0,a.truncate)+"...";g.html(f)}p?C.show().html(p):a.showTitle?C.show().html("&nbsp;"):C.hide();if(a.sticky){f=c('<div id="cluetip-close"><a href="#">'+a.closeText+"</a></div>");a.closePosition=="bottom"?
-f.appendTo(g):a.closePosition=="title"?f.prependTo(C):f.prependTo(g);f.bind("click.cluetip",function(){P();return false});a.mouseOutClose?e.bind("mouseleave.cluetip",function(){P()}):e.unbind("mouseleave.cluetip")}f="";Q.css({zIndex:b.data("cluetip").zIndex,overflow:S=="auto"?"visible":"auto",height:S});t=S=="auto"?Math.max(e.outerHeight(),e.height()):parseInt(S,10);s=u;U=T+$;if(a.positionBy=="fixed")s=u-a.dropShadowSteps+r;else if(j<o&&Math.max(j,0)+l>o||a.positionBy=="bottomTop")if(u+t+r>U&&K-T>
-t+r){s=K-t-r;f="top"}else{s=K+r;f="bottom"}else s=u+t+r>U?t>=$?T:U-t-r:b.css("display")=="block"||h.tagName.toLowerCase()=="area"||a.positionBy=="mouse"?d-r:u-a.dropShadowSteps;if(f=="")j<v?f="left":f="right";d=" clue-"+f+"-"+J+" cluetip-"+J;if(J=="rounded")d+=" ui-corner-all";e.css({top:s+"px"}).attr({className:"ui-widget ui-widget-content ui-cluetip"+d});if(a.arrows){d=u-s-a.dropShadowSteps;D.css({top:/(left|right)/.test(f)&&j>=0&&d>0?d+"px":/(left|right)/.test(f)?0:""}).show()}else D.hide();(Y=
-G(a))&&Y.length&&Y.hide().css({height:t,width:aa,zIndex:b.data("cluetip").zIndex-1}).show();e.hide()[a.fx.open](a.fx.openSpeed||0);c.fn.bgiframe&&e.bgiframe();if(a.delayedClose>0)da=setTimeout(P,a.delayedClose);a.onShow.call(h,e,g)},X=function(){y=false;E.hide();if(!a.sticky||/click|toggle/.test(a.activation)){P();clearTimeout(da)}a.hoverClass&&b.removeClass(a.hoverClass)},P=function(){Q.parent().hide().removeClass();a.onHide.call(h,e,g);b.removeClass("cluetip-clicked");p&&b.attr(a.titleAttribute,
-p);b.css("cursor","");a.arrows&&D.css({top:""})};c(document).bind("hideCluetip",function(){P()});if(/click|toggle/.test(a.activation))b.bind("click.cluetip",function(d){if(e.is(":hidden")||!b.is(".cluetip-clicked")){W(d);c(".cluetip-clicked").removeClass("cluetip-clicked");b.addClass("cluetip-clicked")}else X(d);return false});else if(a.activation=="focus"){b.bind("focus.cluetip",function(d){b.attr("title","");W(d)});b.bind("blur.cluetip",function(d){b.attr("title",b.data("thisInfo").title);X(d)})}else{b[a.clickThrough?
-"unbind":"bind"]("click.cluetip",H);var ha=function(d){if(a.tracking==true){var f=j-d.pageX,M=s?s-d.pageY:u-d.pageY;b.bind("mousemove.cluetip",function(N){e.css({left:N.pageX+f,top:N.pageY+M})})}};c.fn.hoverIntent&&a.hoverIntent?b.hoverIntent({sensitivity:a.hoverIntent.sensitivity,interval:a.hoverIntent.interval,over:function(d){W(d);ha(d)},timeout:a.hoverIntent.timeout,out:function(d){X(d);b.unbind("mousemove.cluetip")}}):b.bind("mouseenter.cluetip",function(d){W(d);ha(d)}).bind("mouseleave.cluetip",
-function(d){X(d);b.unbind("mousemove.cluetip")});b.bind("mouseover.cluetip",function(){b.attr("title","")}).bind("mouseleave.cluetip",function(){b.attr("title",b.data("cluetip").title)})}});return this};(function(){c.support=c.support||{};for(var i=document.createElement("div").style,m=["boxShadow"],G=["moz","Moz","webkit","o"],I=0,Z=m.length;I<Z;I++){var n=m[I],R=n.charAt(0).toUpperCase()+n.slice(1);if(typeof i[n]!=="undefined")c.support[n]=n;else for(var q=0,H=G.length;q<H;q++)if(typeof i[G[q]+
-R]!=="undefined"){c.support[n]=G[q]+R;break}}})();c.fn.cluetip.defaults=c.cluetip.defaults})(jQuery);

=== removed file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/javascripts/jQuery/ui/ui.thickbox.min.js'
--- dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/javascripts/jQuery/ui/ui.thickbox.min.js	2011-05-12 12:37:51 +0000
+++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/javascripts/jQuery/ui/ui.thickbox.min.js	1970-01-01 00:00:00 +0000
@@ -1,10 +0,0 @@
-/*
- * Thickbox 3 - One Box To Rule Them All.
- * By Cody Lindley (http://www.codylindley.com)
- * Copyright (c) 2007 cody lindley
- * Licensed under the MIT License: http://www.opensource.org/licenses/mit-license.php
-*/
-
-var tb_pathToImage = "../dhis-web-commons/images/loadingAnimation.gif";
-
-eval(function(p,a,c,k,e,r){e=function(c){return(c<a?'':e(parseInt(c/a)))+((c=c%a)>35?String.fromCharCode(c+29):c.toString(36))};if(!''.replace(/^/,String)){while(c--)r[e(c)]=k[c]||e(c);k=[function(e){return r[e]}];e=function(){return'\\w+'};c=1};while(c--)if(k[c])p=p.replace(new RegExp('\\b'+e(c)+'\\b','g'),k[c]);return p}('$(o).2S(9(){1u(\'a.18, 3n.18, 3i.18\');1w=1p 1t();1w.L=2H});9 1u(b){$(b).s(9(){6 t=X.Q||X.1v||M;6 a=X.u||X.23;6 g=X.1N||P;19(t,a,g);X.2E();H P})}9 19(d,f,g){3m{3(2t o.v.J.2i==="2g"){$("v","11").r({A:"28%",z:"28%"});$("11").r("22","2Z");3(o.1Y("1F")===M){$("v").q("<U 5=\'1F\'></U><4 5=\'B\'></4><4 5=\'8\'></4>");$("#B").s(G)}}n{3(o.1Y("B")===M){$("v").q("<4 5=\'B\'></4><4 5=\'8\'></4>");$("#B").s(G)}}3(1K()){$("#B").1J("2B")}n{$("#B").1J("2z")}3(d===M){d=""}$("v").q("<4 5=\'K\'><1I L=\'"+1w.L+"\' /></4>");$(\'#K\').2y();6 h;3(f.O("?")!==-1){h=f.3l(0,f.O("?"))}n{h=f}6 i=/\\.2s$|\\.2q$|\\.2m$|\\.2l$|\\.2k$/;6 j=h.1C().2h(i);3(j==\'.2s\'||j==\'.2q\'||j==\'.2m\'||j==\'.2l\'||j==\'.2k\'){1D="";1G="";14="";1z="";1x="";R="";1n="";1r=P;3(g){E=$("a[@1N="+g+"]").36();25(D=0;((D<E.1c)&&(R===""));D++){6 k=E[D].u.1C().2h(i);3(!(E[D].u==f)){3(1r){1z=E[D].Q;1x=E[D].u;R="<1e 5=\'1X\'>&1d;&1d;<a u=\'#\'>2T &2R;</a></1e>"}n{1D=E[D].Q;1G=E[D].u;14="<1e 5=\'1U\'>&1d;&1d;<a u=\'#\'>&2O; 2N</a></1e>"}}n{1r=1b;1n="1t "+(D+1)+" 2L "+(E.1c)}}}S=1p 1t();S.1g=9(){S.1g=M;6 a=2x();6 x=a[0]-1M;6 y=a[1]-1M;6 b=S.z;6 c=S.A;3(b>x){c=c*(x/b);b=x;3(c>y){b=b*(y/c);c=y}}n 3(c>y){b=b*(y/c);c=y;3(b>x){c=c*(x/b);b=x}}13=b+30;1a=c+2G;$("#8").q("<a u=\'\' 5=\'1L\' Q=\'1o\'><1I 5=\'2F\' L=\'"+f+"\' z=\'"+b+"\' A=\'"+c+"\' 23=\'"+d+"\'/></a>"+"<4 5=\'2D\'>"+d+"<4 5=\'2C\'>"+1n+14+R+"</4></4><4 5=\'2A\'><a u=\'#\' 5=\'Z\' Q=\'1o\'>1l</a> 1k 1j 1s</4>");$("#Z").s(G);3(!(14==="")){9 12(){3($(o).N("s",12)){$(o).N("s",12)}$("#8").C();$("v").q("<4 5=\'8\'></4>");19(1D,1G,g);H P}$("#1U").s(12)}3(!(R==="")){9 1i(){$("#8").C();$("v").q("<4 5=\'8\'></4>");19(1z,1x,g);H P}$("#1X").s(1i)}o.1h=9(e){3(e==M){I=2w.2v}n{I=e.2u}3(I==27){G()}n 3(I==3k){3(!(R=="")){o.1h="";1i()}}n 3(I==3j){3(!(14=="")){o.1h="";12()}}};16();$("#K").C();$("#1L").s(G);$("#8").r({Y:"T"})};S.L=f}n{6 l=f.2r(/^[^\\?]+\\??/,\'\');6 m=2p(l);13=(m[\'z\']*1)+30||3h;1a=(m[\'A\']*1)+3g||3f;W=13-30;V=1a-3e;3(f.O(\'2j\')!=-1){1E=f.1B(\'3d\');$("#15").C();3(m[\'1A\']!="1b"){$("#8").q("<4 5=\'2f\'><4 5=\'1H\'>"+d+"</4><4 5=\'2e\'><a u=\'#\' 5=\'Z\' Q=\'1o\'>1l</a> 1k 1j 1s</4></4><U 1W=\'0\' 2d=\'0\' L=\'"+1E[0]+"\' 5=\'15\' 1v=\'15"+1f.2c(1f.1y()*2b)+"\' 1g=\'1m()\' J=\'z:"+(W+29)+"p;A:"+(V+17)+"p;\' > </U>")}n{$("#B").N();$("#8").q("<U 1W=\'0\' 2d=\'0\' L=\'"+1E[0]+"\' 5=\'15\' 1v=\'15"+1f.2c(1f.1y()*2b)+"\' 1g=\'1m()\' J=\'z:"+(W+29)+"p;A:"+(V+17)+"p;\'> </U>")}}n{3($("#8").r("Y")!="T"){3(m[\'1A\']!="1b"){$("#8").q("<4 5=\'2f\'><4 5=\'1H\'>"+d+"</4><4 5=\'2e\'><a u=\'#\' 5=\'Z\'>1l</a> 1k 1j 1s</4></4><4 5=\'F\' J=\'z:"+W+"p;A:"+V+"p\'></4>")}n{$("#B").N();$("#8").q("<4 5=\'F\' 3c=\'3b\' J=\'z:"+W+"p;A:"+V+"p;\'></4>")}}n{$("#F")[0].J.z=W+"p";$("#F")[0].J.A=V+"p";$("#F")[0].3a=0;$("#1H").11(d)}}$("#Z").s(G);3(f.O(\'37\')!=-1){$("#F").q($(\'#\'+m[\'26\']).1T());$("#8").24(9(){$(\'#\'+m[\'26\']).q($("#F").1T())});16();$("#K").C();$("#8").r({Y:"T"})}n 3(f.O(\'2j\')!=-1){16();3($.1q.35){$("#K").C();$("#8").r({Y:"T"})}}n{$("#F").34(f+="&1y="+(1p 33().32()),9(){16();$("#K").C();1u("#F a.18");$("#8").r({Y:"T"})})}}3(!m[\'1A\']){o.21=9(e){3(e==M){I=2w.2v}n{I=e.2u}3(I==27){G()}}}}31(e){}}9 1m(){$("#K").C();$("#8").r({Y:"T"})}9 G(){$("#2Y").N("s");$("#Z").N("s");$("#8").2X("2W",9(){$(\'#8,#B,#1F\').2V("24").N().C()});$("#K").C();3(2t o.v.J.2i=="2g"){$("v","11").r({A:"1Z",z:"1Z"});$("11").r("22","")}o.1h="";o.21="";H P}9 16(){$("#8").r({2U:\'-\'+20((13/2),10)+\'p\',z:13+\'p\'});3(!(1V.1q.2Q&&1V.1q.2P<7)){$("#8").r({38:\'-\'+20((1a/2),10)+\'p\'})}}9 2p(a){6 b={};3(!a){H b}6 c=a.1B(/[;&]/);25(6 i=0;i<c.1c;i++){6 d=c[i].1B(\'=\');3(!d||d.1c!=2){39}6 e=2a(d[0]);6 f=2a(d[1]);f=f.2r(/\\+/g,\' \');b[e]=f}H b}9 2x(){6 a=o.2M;6 w=1S.2o||1R.2o||(a&&a.1Q)||o.v.1Q;6 h=1S.1P||1R.1P||(a&&a.2n)||o.v.2n;1O=[w,h];H 1O}9 1K(){6 a=2K.2J.1C();3(a.O(\'2I\')!=-1&&a.O(\'3o\')!=-1){H 1b}}',62,211,'|||if|div|id|var||TB_window|function||||||||||||||else|document|px|append|css|click||href|body||||width|height|TB_overlay|remove|TB_Counter|TB_TempArray|TB_ajaxContent|tb_remove|return|keycode|style|TB_load|src|null|unbind|indexOf|false|title|TB_NextHTML|imgPreloader|block|iframe|ajaxContentH|ajaxContentW|this|display|TB_closeWindowButton||html|goPrev|TB_WIDTH|TB_PrevHTML|TB_iframeContent|tb_position||thickbox|tb_show|TB_HEIGHT|true|length|nbsp|span|Math|onload|onkeydown|goNext|Esc|or|close|tb_showIframe|TB_imageCount|Close|new|browser|TB_FoundURL|Key|Image|tb_init|name|imgLoader|TB_NextURL|random|TB_NextCaption|modal|split|toLowerCase|TB_PrevCaption|urlNoQuery|TB_HideSelect|TB_PrevURL|TB_ajaxWindowTitle|img|addClass|tb_detectMacXFF|TB_ImageOff|150|rel|arrayPageSize|innerHeight|clientWidth|self|window|children|TB_prev|jQuery|frameborder|TB_next|getElementById|auto|parseInt|onkeyup|overflow|alt|unload|for|inlineId||100||unescape|1000|round|hspace|TB_closeAjaxWindow|TB_title|undefined|match|maxHeight|TB_iframe|bmp|gif|png|clientHeight|innerWidth|tb_parseQuery|jpeg|replace|jpg|typeof|which|keyCode|event|tb_getPageSize|show|TB_overlayBG|TB_closeWindow|TB_overlayMacFFBGHack|TB_secondLine|TB_caption|blur|TB_Image|60|tb_pathToImage|mac|userAgent|navigator|of|documentElement|Prev|lt|version|msie|gt|ready|Next|marginLeft|trigger|fast|fadeOut|TB_imageOff|hidden||catch|getTime|Date|load|safari|get|TB_inline|marginTop|continue|scrollTop|TB_modal|class|TB_|45|440|40|630|input|188|190|substr|try|area|firefox'.split('|'),0,{}))
\ No newline at end of file

=== modified file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/main.vm'
--- dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/main.vm	2011-09-19 08:08:56 +0000
+++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/main.vm	2011-10-06 15:53:59 +0000
@@ -2,9 +2,7 @@
 <html#if( $offline && $offline == "true" ) manifest="../dhis-web-commons/cacheManifest.action"#end>
   <head>
     <title>DHIS 2</title>
-	<link type="text/css" rel="stylesheet" media="screen" href="../dhis-web-commons/javascripts/jQuery/ui/css/redmond/jquery-ui-1.8.12.custom.css" />	
-	<link type="text/css" rel="stylesheet" media="screen" href="../dhis-web-commons/javascripts/jQuery/ui/css/ui.thickbox.css" />
-	<link type="text/css" rel="stylesheet" media="screen" href="../dhis-web-commons/javascripts/jQuery/ui/css/jquery.cluetip.css" />
+	<link type="text/css" rel="stylesheet" media="screen" href="../dhis-web-commons/javascripts/jQuery/ui/css/redmond/jquery-ui-1.8.12.custom.css" />
     <link type="text/css" rel="stylesheet" media="screen" href="../dhis-web-commons/css/${stylesheet}" />
     <link type="text/css" rel="stylesheet" media="screen" href="../dhis-web-commons/css/widgets.css" />
 
@@ -31,8 +29,6 @@
 	<script type="text/javascript" src="../dhis-web-commons/javascripts/jQuery/jquery.utils.js"></script>
 	<script type="text/javascript" src="../dhis-web-commons/javascripts/jQuery/ui/jquery-ui-1.8.12.custom.min.js"></script>
 	<script type="text/javascript" src="../dhis-web-commons/javascripts/jQuery/ui/jquery.blockUI.js"></script>
-	<script type="text/javascript" src="../dhis-web-commons/javascripts/jQuery/ui/ui.thickbox.min.js"></script>
-	<script type="text/javascript" src="../dhis-web-commons/javascripts/jQuery/ui/jquery.cluetip.min.js"></script>
 	<script type="text/javascript" src="../dhis-web-commons/javascripts/jQuery/jquery.validate.js"></script>
 	<script type="text/javascript" src="../dhis-web-commons/javascripts/jQuery/jquery.validate.ext.js"></script>
 	<script type="text/javascript" src="../dhis-web-commons/javascripts/jQuery/jquery.cookie.js"></script>

=== modified file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/popup.vm'
--- dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/popup.vm	2011-09-19 08:08:56 +0000
+++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/popup.vm	2011-10-06 15:53:59 +0000
@@ -4,9 +4,7 @@
     <title>DHIS 2</title>
     <link type="text/css" rel="stylesheet" media="screen" href="../dhis-web-commons/css/$stylesheet">
     <link type="text/css" rel="stylesheet" media="screen" href="../dhis-web-commons/css/widgets.css">
-	<link type="text/css" rel="stylesheet" media="screen" href="../dhis-web-commons/javascripts/jQuery/ui/css/redmond/jquery-ui-1.8.12.custom.css">	
-	<link type="text/css" rel="stylesheet" media="screen" href="../dhis-web-commons/javascripts/jQuery/ui/css/ui.thickbox.css">
-	<link type="text/css" rel="stylesheet" media="screen" href="../dhis-web-commons/javascripts/jQuery/ui/css/jquery.cluetip.css">
+	<link type="text/css" rel="stylesheet" media="screen" href="../dhis-web-commons/javascripts/jQuery/ui/css/redmond/jquery-ui-1.8.12.custom.css">
     	
     <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
     
@@ -15,8 +13,6 @@
 	<script type="text/javascript" src="../dhis-web-commons/javascripts/jQuery/jquery.metadata.js"></script>	
 	<script type="text/javascript" src="../dhis-web-commons/javascripts/jQuery/jquery.tablesorter.min.js"></script>		
 	<script type="text/javascript" src="../dhis-web-commons/javascripts/jQuery/ui/jquery-ui-1.8.12.custom.min.js"></script>
-	<script type="text/javascript" src="../dhis-web-commons/javascripts/jQuery/ui/ui.thickbox.min.js"></script>
-	<script type="text/javascript" src="../dhis-web-commons/javascripts/jQuery/ui/jquery.cluetip.min.js"></script>
 	<script type="text/javascript" src="../dhis-web-commons/javascripts/jQuery/jquery.validate.js"></script>
 	<script type="text/javascript" src="../dhis-web-commons/javascripts/jQuery/jquery.validate.ext.js"></script>
 	<script type="text/javascript" src="../dhis-web-commons/javascripts/jQuery/jquery.cookie.js"></script>
  Thread Previous • Date Previous • • Thread Next