dhis2-devs team mailing list archive
-
dhis2-devs team
-
Mailing list archive
-
Message #17369
[Branch ~dhis2-devs-core/dhis2/trunk] Rev 6881: Ext ux carousel added. Work in progress.
------------------------------------------------------------
revno: 6881
committer: Jan Henrik Overland <janhenrik.overland@xxxxxxxxx>
branch nick: dhis2
timestamp: Tue 2012-05-08 18:31:17 +0200
message:
Ext ux carousel added. Work in progress.
added:
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/javascripts/ext-ux/carousel/
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/javascripts/ext-ux/carousel/Carousel.js
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/javascripts/ext-ux/carousel/css/
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/javascripts/ext-ux/carousel/css/carousel.css
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/javascripts/ext-ux/carousel/img/
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/javascripts/ext-ux/carousel/img/next.png
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/javascripts/ext-ux/carousel/img/pause.png
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/javascripts/ext-ux/carousel/img/play.png
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/javascripts/ext-ux/carousel/img/prev.png
--
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
=== added directory 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/javascripts/ext-ux/carousel'
=== added file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/javascripts/ext-ux/carousel/Carousel.js'
--- dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/javascripts/ext-ux/carousel/Carousel.js 1970-01-01 00:00:00 +0000
+++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/javascripts/ext-ux/carousel/Carousel.js 2012-05-08 16:31:17 +0000
@@ -0,0 +1,331 @@
+/*!
+ * Ext Core Library $version
http://extjs.com/
Copyright(c) 2006-2009, $author.

The MIT License

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
in the Software without restriction, including without limitation the rights
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
copies of the Software, and to permit persons to whom the Software is
furnished to do so, subject to the following conditions:

The above copyright notice and this permission notice shall be included in
all copies or substantial portions of the Software.

THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
THE SOFTWARE.

+ */
+Ext.ns('Ext.ux.carousel');
+
+Ext.ux.carousel.Carousel = Ext.extend(Ext.util.Observable, {
+ interval: 3,
+ transitionDuration: 600,
+ transitionType: 'carousel',
+ transitionEasing: 'easeOut',
+ itemSelector: 'img',
+ activeSlide: 0,
+ autoPlay: false,
+ showPlayButton: false,
+ pauseOnNavigate: false,
+ wrap: false,
+ freezeOnHover: false,
+ navigationOnHover: false,
+ hideNavigation: false,
+ width: null,
+ height: null,
+
+ constructor: function(elId, config) {
+ config = config || {};
+ Ext.apply(this, config);
+
+ Ext.ux.carousel.Carousel.superclass.constructor.call(this, config);
+
+ this.addEvents(
+ 'beforeprev',
+ 'prev',
+ 'beforenext',
+ 'next',
+ 'change',
+ 'play',
+ 'pause',
+ 'freeze',
+ 'unfreeze'
+ );
+
+ this.el = Ext.get(elId);
+ this.slides = this.els = [];
+
+ if(this.autoPlay || this.showPlayButton) {
+ this.wrap = true;
+ };
+
+ if(this.autoPlay && typeof config.showPlayButton === 'undefined') {
+ this.showPlayButton = true;
+ }
+
+ this.initMarkup();
+ this.initEvents();
+
+ if(this.carouselSize > 0) {
+ this.refresh();
+ }
+ },
+
+ initMarkup: function() {
+ var dh = Ext.DomHelper;
+
+ this.carouselSize = 0;
+ var items = this.el.select(this.itemSelector);
+ this.els.container = dh.append(this.el, {cls: 'ux-carousel-container'}, true);
+ this.els.slidesWrap = dh.append(this.els.container, {cls: 'ux-carousel-slides-wrap'}, true);
+
+ this.els.navigation = dh.append(this.els.container, {cls: 'ux-carousel-nav'}, true).hide();
+ this.els.caption = dh.append(this.els.navigation, {tag: 'h2', cls: 'ux-carousel-caption'}, true);
+ this.els.navNext = dh.append(this.els.navigation, {tag: 'a', href: '#', cls: 'ux-carousel-nav-next'}, true);
+ if(this.showPlayButton) {
+ this.els.navPlay = dh.append(this.els.navigation, {tag: 'a', href: '#', cls: 'ux-carousel-nav-play'}, true)
+ }
+ this.els.navPrev = dh.append(this.els.navigation, {tag: 'a', href: '#', cls: 'ux-carousel-nav-prev'}, true);
+
+ // set the dimensions of the container
+ this.slideWidth = this.width || this.el.getWidth(true);
+ this.slideHeight = this.height || this.el.getHeight(true);
+ this.els.container.setStyle({
+ width: this.slideWidth + 'px',
+ height: this.slideHeight + 'px'
+ });
+
+ this.els.caption.setWidth((this.slideWidth - (this.els.navNext.getWidth()*2) - (this.showPlayButton ? this.els.navPlay.getWidth() : 0) - 20) + 'px')
+
+ items.appendTo(this.els.slidesWrap).each(function(item) {
+ item = item.wrap({cls: 'ux-carousel-slide'});
+ this.slides.push(item);
+ item.setWidth(this.slideWidth + 'px').setHeight(this.slideHeight + 'px');
+ }, this);
+ this.carouselSize = this.slides.length;
+ if(this.navigationOnHover) {
+ this.els.navigation.setStyle('top', (-1*this.els.navigation.getHeight()) + 'px');
+ }
+ this.el.clip();
+ },
+
+ initEvents: function() {
+ this.els.navPrev.on('click', function(ev) {
+ ev.preventDefault();
+ var target = ev.getTarget();
+ target.blur();
+ if(Ext.fly(target).hasCls('ux-carousel-nav-disabled')) return;
+ this.prev();
+ }, this);
+
+ this.els.navNext.on('click', function(ev) {
+ ev.preventDefault();
+ var target = ev.getTarget();
+ target.blur();
+ if(Ext.fly(target).hasCls('ux-carousel-nav-disabled')) return;
+ this.next();
+ }, this);
+
+ if(this.showPlayButton) {
+ this.els.navPlay.on('click', function(ev){
+ ev.preventDefault();
+ ev.getTarget().blur();
+ if(this.playing) {
+ this.pause();
+ }
+ else {
+ this.play();
+ }
+ }, this);
+ };
+
+ if(this.freezeOnHover) {
+ this.els.container.on('mouseenter', function(){
+ if(this.playing) {
+ this.fireEvent('freeze', this.slides[this.activeSlide]);
+ Ext.TaskManager.stop(this.playTask);
+ }
+ }, this);
+ this.els.container.on('mouseleave', function(){
+ if(this.playing) {
+ this.fireEvent('unfreeze', this.slides[this.activeSlide]);
+ Ext.TaskManager.start(this.playTask);
+ }
+ }, this, {buffer: (this.interval/2)*1000});
+ };
+
+ if(this.navigationOnHover) {
+ this.els.container.on('mouseenter', function(){
+ if(!this.navigationShown) {
+ this.navigationShown = true;
+ this.els.navigation.stopFx(false).shift({
+ y: this.els.container.getY(),
+ duration: this.transitionDuration
+ })
+ }
+ }, this);
+
+ this.els.container.on('mouseleave', function(){
+ if(this.navigationShown) {
+ this.navigationShown = false;
+ this.els.navigation.stopFx(false).shift({
+ y: this.els.navigation.getHeight() - this.els.container.getY(),
+ duration: this.transitionDuration
+ })
+ }
+ }, this);
+ }
+
+ if(this.interval && this.autoPlay) {
+ this.play();
+ };
+ },
+
+ prev: function() {
+ if (this.fireEvent('beforeprev') === false) {
+ return;
+ }
+ if(this.pauseOnNavigate) {
+ this.pause();
+ }
+ this.setSlide(this.activeSlide - 1);
+
+ this.fireEvent('prev', this.activeSlide);
+ return this;
+ },
+
+ next: function() {
+ if(this.fireEvent('beforenext') === false) {
+ return;
+ }
+ if(this.pauseOnNavigate) {
+ this.pause();
+ }
+ this.setSlide(this.activeSlide + 1);
+
+ this.fireEvent('next', this.activeSlide);
+ return this;
+ },
+
+ play: function() {
+ if(!this.playing) {
+ this.playTask = this.playTask || {
+ run: function() {
+ this.playing = true;
+ this.setSlide(this.activeSlide+1);
+ },
+ interval: this.interval*1000,
+ scope: this
+ };
+
+ this.playTaskBuffer = this.playTaskBuffer || new Ext.util.DelayedTask(function() {
+ Ext.TaskManager.start(this.playTask);
+ }, this);
+
+ this.playTaskBuffer.delay(this.interval*1000);
+ this.playing = true;
+ if(this.showPlayButton) {
+ this.els.navPlay.addCls('ux-carousel-playing');
+ }
+ this.fireEvent('play');
+ }
+ return this;
+ },
+
+ pause: function() {
+ if(this.playing) {
+ Ext.TaskManager.stop(this.playTask);
+ this.playTaskBuffer.cancel();
+ this.playing = false;
+ if(this.showPlayButton) {
+ this.els.navPlay.removeCls('ux-carousel-playing');
+ }
+ this.fireEvent('pause');
+ }
+ return this;
+ },
+
+ clear: function() {
+ this.els.slidesWrap.update('');
+ this.slides = [];
+ this.carouselSize = 0;
+ this.pause();
+ return this;
+ },
+
+ add: function(el, refresh) {
+ var item = Ext.fly(el).appendTo(this.els.slidesWrap).wrap({cls: 'ux-carousel-slide'});
+ item.setWidth(this.slideWidth + 'px').setHeight(this.slideHeight + 'px');
+ this.slides.push(item);
+ if(refresh) {
+ this.refresh();
+ }
+ return this;
+ },
+
+ refresh: function() {
+ this.carouselSize = this.slides.length;
+ this.els.slidesWrap.setWidth((this.slideWidth * this.carouselSize) + 'px');
+ if(this.carouselSize > 0) {
+ if(!this.hideNavigation) this.els.navigation.show();
+ this.activeSlide = 0;
+ this.setSlide(0, true);
+ }
+ return this;
+ },
+
+ setSlide: function(index, initial) {
+ if(!this.wrap && !this.slides[index]) {
+ return;
+ }
+ else if(this.wrap) {
+ if(index < 0) {
+ index = this.carouselSize-1;
+ }
+ else if(index > this.carouselSize-1) {
+ index = 0;
+ }
+ }
+ if(!this.slides[index]) {
+ return;
+ }
+
+ this.els.caption.update(this.slides[index].child(':first-child', true).title || '');
+ var offset = index * this.slideWidth;
+ if (!initial) {
+ switch (this.transitionType) {
+ case 'fade':
+ this.slides[index].setOpacity(0);
+ //this.slides[this.activeSlide].stopFx(false).fadeOut({
+ this.slides[this.activeSlide].stopAnimation().fadeOut({
+ duration: this.transitionDuration / 2,
+ callback: function(){
+ this.els.slidesWrap.setStyle('left', (-1 * offset) + 'px');
+ this.slides[this.activeSlide].setOpacity(1);
+ this.slides[index].fadeIn({
+ duration: this.transitionDuration / 2
+ });
+ },
+ scope: this
+ })
+ break;
+
+ default:
+ var xNew = (-1 * offset) + this.els.container.getX();
+ this.els.slidesWrap.stopAnimation();
+ this.els.slidesWrap.shift({
+ duration: this.transitionDuration,
+ x: xNew,
+ easing: this.transitionEasing
+ });
+ break;
+ }
+ }
+ else {
+ this.els.slidesWrap.setStyle('left', '0');
+ }
+
+ this.activeSlide = index;
+ this.updateNav();
+ this.fireEvent('change', this.slides[index], index);
+ },
+
+ updateNav: function() {
+ this.els.navPrev.removeCls('ux-carousel-nav-disabled');
+ this.els.navNext.removeCls('ux-carousel-nav-disabled');
+ if(!this.wrap) {
+ if(this.activeSlide === 0) {
+ this.els.navPrev.addCls('ux-carousel-nav-disabled');
+ }
+ if(this.activeSlide === this.carouselSize-1) {
+ this.els.navNext.addCls('ux-carousel-nav-disabled');
+ }
+ }
+ }
+});
=== added directory 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/javascripts/ext-ux/carousel/css'
=== added file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/javascripts/ext-ux/carousel/css/carousel.css'
--- dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/javascripts/ext-ux/carousel/css/carousel.css 1970-01-01 00:00:00 +0000
+++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/javascripts/ext-ux/carousel/css/carousel.css 2012-05-08 16:31:17 +0000
@@ -0,0 +1,90 @@
+/*!
+ * Ext Core Library $version
http://extjs.com/
Copyright(c) 2006-2009, $author.

The MIT License

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
in the Software without restriction, including without limitation the rights
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
copies of the Software, and to permit persons to whom the Software is
furnished to do so, subject to the following conditions:

The above copyright notice and this permission notice shall be included in
all copies or substantial portions of the Software.

THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
THE SOFTWARE.

+ */
+.ux-carousel-container {
+ overflow: hidden;
+ position: relative;
+}
+
+.ux-carousel-slides-wrap {
+ position: absolute;
+ top: 0;
+ left: 0;
+}
+
+.ux-carousel-slide {
+ float: left;
+ overflow: hidden;
+ text-align: center;
+}
+
+.ux-carousel-nav {
+ height: 21px;
+ width: 100%;
+ background-color: #d1ccc7;
+ position: absolute;
+ top: 0;
+ left: 0;
+ opacity: 0.8;
+ filter: alpha(opacity=80);
+ padding-right: 3px;
+}
+
+.ux-carousel-caption {
+ font-size: 14px;
+ float: left;
+ padding: 3px 5px;
+ margin: 0;
+ text-transform: none;
+ color: black;
+ overflow: hidden;
+ width: 100px;
+}
+
+.ux-carousel-nav-prev,
+.ux-carousel-nav-next,
+.ux-carousel-nav-play {
+ height: 16px;
+ display: block;
+ float: right;
+ margin: 3px 0;
+ background-position: 0 16px;
+}
+
+.ux-carousel-nav .ux-carousel-nav-prev {
+ background-image: url('../img/prev.png');
+ height: 16px;
+ width: 16px;
+}
+
+.ux-carousel-nav .ux-carousel-nav-next {
+ background-image: url('../img/next.png');
+ height: 16px;
+ width: 16px;
+}
+
+.ux-carousel-nav-play {
+ background-image: url('../img/play.png');
+ height: 16px;
+ width: 16px;
+}
+
+.ux-carousel-nav-play:hover {
+ background-position: 0 0;
+}
+.ux-carousel-nav-play.ux-carousel-playing {
+ background-position: 16px 16px;
+}
+.ux-carousel-nav-play.ux-carousel-playing:hover {
+ background-position: 16px 0;
+}
+
+.ux-carousel-nav-prev:hover,
+.ux-carousel-nav-next:hover {
+ background-position: 0 0px;
+}
+
+.ux-carousel-nav-prev.ux-carousel-nav-disabled,
+.ux-carousel-nav-next.ux-carousel-nav-disabled {
+ background-position: 0 0;
+}
=== added directory 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/javascripts/ext-ux/carousel/img'
=== added file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/javascripts/ext-ux/carousel/img/next.png'
Binary files dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/javascripts/ext-ux/carousel/img/next.png 1970-01-01 00:00:00 +0000 and dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/javascripts/ext-ux/carousel/img/next.png 2012-05-08 16:31:17 +0000 differ
=== added file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/javascripts/ext-ux/carousel/img/pause.png'
Binary files dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/javascripts/ext-ux/carousel/img/pause.png 1970-01-01 00:00:00 +0000 and dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/javascripts/ext-ux/carousel/img/pause.png 2012-05-08 16:31:17 +0000 differ
=== added file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/javascripts/ext-ux/carousel/img/play.png'
Binary files dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/javascripts/ext-ux/carousel/img/play.png 1970-01-01 00:00:00 +0000 and dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/javascripts/ext-ux/carousel/img/play.png 2012-05-08 16:31:17 +0000 differ
=== added file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/javascripts/ext-ux/carousel/img/prev.png'
Binary files dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/javascripts/ext-ux/carousel/img/prev.png 1970-01-01 00:00:00 +0000 and dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/javascripts/ext-ux/carousel/img/prev.png 2012-05-08 16:31:17 +0000 differ