sanj/oxjs
1
0
Fork 0
forked from 0x2620/oxjs
Code Pull requests Activity

fixing paths in Ox.UI

Browse source
This commit is contained in:
rolux 2011-04-25 14:03:49 +02:00
commit fd58906e04
13 changed files with 23 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

8
source/css/Ox.UI.classic.css
View file

@ -320,16 +320,16 @@ Scrollbars
background: -webkit-gradient(linear, left top, right top, from(rgb(224, 224, 224)), to(rgb(192, 192, 192))); background: -webkit-gradient(linear, left top, right top, from(rgb(224, 224, 224)), to(rgb(192, 192, 192)));
} }
.OxThemeClassic ::-webkit-scrollbar-button:horizontal:decrement { .OxThemeClassic ::-webkit-scrollbar-button:horizontal:decrement {
background: url(../png/ox.ui.classic/scrollbarHorizontalDecrement.png); background: url(../png/Ox.UI.classic/scrollbarHorizontalDecrement.png);
} }
.OxThemeClassic ::-webkit-scrollbar-button:horizontal:increment { .OxThemeClassic ::-webkit-scrollbar-button:horizontal:increment {
background: url(../png/ox.ui.classic/scrollbarHorizontalIncrement.png); background: url(../png/Ox.UI.classic/scrollbarHorizontalIncrement.png);
} }
.OxThemeClassic ::-webkit-scrollbar-button:vertical:decrement { .OxThemeClassic ::-webkit-scrollbar-button:vertical:decrement {
background: url(../png/ox.ui.classic/scrollbarVerticalDecrement.png); background: url(../png/Ox.UI.classic/scrollbarVerticalDecrement.png);
} }
.OxThemeClassic ::-webkit-scrollbar-button:vertical:increment { .OxThemeClassic ::-webkit-scrollbar-button:vertical:increment {
background: url(../png/ox.ui.classic/scrollbarVerticalIncrement.png); background: url(../png/Ox.UI.classic/scrollbarVerticalIncrement.png);
} }
.OxThemeClassic ::-webkit-scrollbar-corner { .OxThemeClassic ::-webkit-scrollbar-corner {
border-right: 1px solid rgb(176, 176, 176); border-right: 1px solid rgb(176, 176, 176);

8
source/css/Ox.UI.modern.css
View file

@ -329,16 +329,16 @@ Scrollbars
background: -webkit-gradient(linear, left top, right top, from(rgb(96, 96, 96)), to(rgb(64, 64, 64))); background: -webkit-gradient(linear, left top, right top, from(rgb(96, 96, 96)), to(rgb(64, 64, 64)));
} }
.OxThemeModern ::-webkit-scrollbar-button:horizontal:decrement { .OxThemeModern ::-webkit-scrollbar-button:horizontal:decrement {
background: url(../png/ox.ui.modern/scrollbarHorizontalDecrement.png); background: url(../png/Ox.UI.modern/scrollbarHorizontalDecrement.png);
} }
.OxThemeModern ::-webkit-scrollbar-button:horizontal:increment { .OxThemeModern ::-webkit-scrollbar-button:horizontal:increment {
background: url(../png/ox.ui.modern/scrollbarHorizontalIncrement.png); background: url(../png/Ox.UI.modern/scrollbarHorizontalIncrement.png);
} }
.OxThemeModern ::-webkit-scrollbar-button:vertical:decrement { .OxThemeModern ::-webkit-scrollbar-button:vertical:decrement {
background: url(../png/ox.ui.modern/scrollbarVerticalDecrement.png); background: url(../png/Ox.UI.modern/scrollbarVerticalDecrement.png);
} }
.OxThemeModern ::-webkit-scrollbar-button:vertical:increment { .OxThemeModern ::-webkit-scrollbar-button:vertical:increment {
background: url(../png/ox.ui.modern/scrollbarVerticalIncrement.png); background: url(../png/Ox.UI.modern/scrollbarVerticalIncrement.png);
} }
.OxThemeModern ::-webkit-scrollbar-corner { .OxThemeModern ::-webkit-scrollbar-corner {
border-right: 1px solid rgb(48, 48, 48); border-right: 1px solid rgb(48, 48, 48);

2
source/js/Ox.UI/Core/Ox.Theme.js
View file

@ -35,7 +35,7 @@ Ox.Theme = function(theme) {
var $this = $(this); var $this = $(this);
$this.attr({ $this.attr({
src: $this.attr('src') src: $this.attr('src')
.replace('ox.ui.' + currentTheme, 'ox.ui.' + theme) .replace('Ox.UI.' + currentTheme, 'Ox.UI.' + theme)
}); });
}); });
} }

2
source/js/Ox.UI/List/Ox.IconItem.js
View file

@ -21,7 +21,7 @@ Ox.IconItem = function(options, self) {
height: self.options.size * 1.5, height: self.options.size * 1.5,
lineLength: self.options.size == 64 ? 15 : 23, lineLength: self.options.size == 64 ? 15 : 23,
lines: self.options.size == 64 ? 4 : 5, lines: self.options.size == 64 ? 4 : 5,
url: Ox.UI.PATH + '/png/ox.ui/transparent.png', url: Ox.PATH + '/png/Ox.UI/transparent.png',
width: self.options.size width: self.options.size
}); });
self.title = formatText(self.options.title, self.lines - 1, self.lineLength); self.title = formatText(self.options.title, self.lines - 1, self.lineLength);

2
source/js/Ox.UI/List/Ox.ListMap.js
View file

@ -48,7 +48,7 @@ Ox.ListMap = function(options, self) {
return $('<img>') return $('<img>')
.attr({ .attr({
// fixme: not the right place to do these // fixme: not the right place to do these
src: Ox.UI.PATH + 'svg/ox.map/' + (value || 'NTHH') + '.' + (value == 'RE' ? 'png' : 'svg') src: Ox.PATH + 'svg/ox.map/' + (value || 'NTHH') + '.' + (value == 'RE' ? 'png' : 'svg')
}) })
.load(function() { .load(function() {
$(this).css({ $(this).css({

2
source/js/Ox.UI/Map/Ox.MapImage.js
View file

@ -46,7 +46,7 @@ Ox.MapImage = function(options, self) {
Ox.forEach(self.markers, function(markers, k) { Ox.forEach(self.markers, function(markers, k) {
if (markers.length) { if (markers.length) {
self.src += '&markers=icon:' + 'http://dev.pan.do:8000' + self.src += '&markers=icon:' + 'http://dev.pan.do:8000' +
Ox.UI.PATH + 'png/ox.map/marker' + Ox.PATH + 'png/ox.map/marker' +
Ox.toTitleCase(self.options['markerColor' + Ox.toTitleCase(k)]) + Ox.toTitleCase(self.options['markerColor' + Ox.toTitleCase(k)]) +
'.png|' + markers.join('|') '.png|' + markers.join('|')
} }

2
source/js/Ox.UI/Map/Ox.MapMarker.js
View file

@ -77,7 +77,7 @@ Ox.MapMarker = function(options) {
cursor: that.place.editing ? 'move' : 'pointer', cursor: that.place.editing ? 'move' : 'pointer',
draggable: that.place.editing, draggable: that.place.editing,
icon: new google.maps.MarkerImage( icon: new google.maps.MarkerImage(
Ox.UI.PATH + 'png/ox.map/marker' + Ox.PATH + 'png/ox.map/marker' +
(that.place.id[0] == '_' ? 'Result' : '') + (that.place.id[0] == '_' ? 'Result' : '') +
(that.place.editing ? 'Editing' : ( (that.place.editing ? 'Editing' : (
that.place.selected ? 'Selected' : '' that.place.selected ? 'Selected' : ''

2
source/js/Ox.UI/Map/Ox.MapRectangleMarker.js
View file

@ -17,7 +17,7 @@ Ox.MapRectangleMarker = function(options, self) {
cursor: that.position + '-resize', cursor: that.position + '-resize',
draggable: true, draggable: true,
icon: new google.maps.MarkerImage( icon: new google.maps.MarkerImage(
Ox.UI.PATH + 'png/ox.map/markerResize.png', Ox.PATH + 'png/ox.map/markerResize.png',
new google.maps.Size(16, 16), new google.maps.Size(16, 16),
new google.maps.Point(0, 0), new google.maps.Point(0, 0),
new google.maps.Point(8, 8) new google.maps.Point(8, 8)

2
source/js/Ox.UI/Ox.UI.js
View file

@ -102,7 +102,7 @@ Ox.load.UI = function(options, callback) {
}).join(' '); }).join(' ');
div.addClass('OxError'); div.addClass('OxError');
browsers.forEach(function(browser) { browsers.forEach(function(browser) {
browser.src = Ox.PATH + 'png/ox.ui/browser' + browser.name + '128.png'; browser.src = Ox.PATH + 'png/Ox.UI/browser' + browser.name + '128.png';
Ox.loadFile(browser.src, function() { Ox.loadFile(browser.src, function() {
++counter == browsers.length && showIcons(); ++counter == browsers.length && showIcons();
}); });

4
source/js/Ox.UI/Video/Ox.BlockTimeline.js
View file

@ -58,7 +58,7 @@ Ox.BlockTimeline = function(options, self) {
self.$markerPosition = $('<img>') self.$markerPosition = $('<img>')
.addClass('OxMarkerPosition') .addClass('OxMarkerPosition')
.attr({ .attr({
src: Ox.UI.PATH + 'png/ox.ui/videoMarkerPlay.png' src: Ox.PATH + 'png/Ox.UI/videoMarkerPlay.png'
}) })
.css({ .css({
position: 'absolute', position: 'absolute',
@ -75,7 +75,7 @@ Ox.BlockTimeline = function(options, self) {
self.$markerPoint[i] = $('<img>') self.$markerPoint[i] = $('<img>')
.addClass('OxMarkerPoint' + titleCase) .addClass('OxMarkerPoint' + titleCase)
.attr({ .attr({
src: Ox.UI.PATH + 'png/ox.ui/videoMarker' + titleCase + '.png' src: Ox.PATH + 'png/Ox.UI/videoMarker' + titleCase + '.png'
}) })
.appendTo(that.$element); .appendTo(that.$element);
setMarkerPoint(i); setMarkerPoint(i);

6
source/js/Ox.UI/Video/Ox.LargeTimeline.js
View file

@ -62,7 +62,7 @@ Ox.LargeTimeline = function(options, self) {
self.$cuts[i] = $('<img>') self.$cuts[i] = $('<img>')
.addClass('OxCut') .addClass('OxCut')
.attr({ .attr({
src: Ox.UI.PATH + 'png/ox.ui/videoMarkerCut.png' src: Ox.PATH + 'png/Ox.UI/videoMarkerCut.png'
}) })
.css({ .css({
left: (v * self.fps) + 'px' left: (v * self.fps) + 'px'
@ -73,7 +73,7 @@ Ox.LargeTimeline = function(options, self) {
self.$markerPosition = $('<img>') self.$markerPosition = $('<img>')
.addClass('OxMarkerPosition') .addClass('OxMarkerPosition')
.attr({ .attr({
src: Ox.UI.PATH + 'png/ox.ui/videoMarkerPlay.png' src: Ox.PATH + 'png/Ox.UI/videoMarkerPlay.png'
}) })
.appendTo(that.$element); .appendTo(that.$element);
setMarker(); setMarker();
@ -82,7 +82,7 @@ Ox.LargeTimeline = function(options, self) {
self.$markerPoint[i] = $('<img>') self.$markerPoint[i] = $('<img>')
.addClass('OxMarkerPoint' + v) .addClass('OxMarkerPoint' + v)
.attr({ .attr({
src: Ox.UI.PATH + 'png/ox.ui/videoMarker' + v + '.png' src: Ox.PATH + 'png/Ox.UI/videoMarker' + v + '.png'
}) })
.appendTo(self.$timeline); .appendTo(self.$timeline);
setMarkerPoint(i); setMarkerPoint(i);

4
source/js/Ox.UI/Video/Ox.SmallTimeline.js
View file

@ -60,7 +60,7 @@ Ox.SmallTimeline = function(options, self) {
self.$markerPosition = $('<img>') self.$markerPosition = $('<img>')
.addClass('OxMarkerPosition') .addClass('OxMarkerPosition')
.attr({ .attr({
src: Ox.UI.PATH + 'png/ox.ui/videoMarkerPlay.png' src: Ox.PATH + 'png/Ox.UI/videoMarkerPlay.png'
}) })
.css({ .css({
position: 'absolute', position: 'absolute',
@ -77,7 +77,7 @@ Ox.SmallTimeline = function(options, self) {
self.$markerPoint[i] = $('<img>') self.$markerPoint[i] = $('<img>')
.addClass('OxMarkerPoint' + titleCase) .addClass('OxMarkerPoint' + titleCase)
.attr({ .attr({
src: Ox.UI.PATH + 'png/ox.ui/videoMarker' + titleCase + '.png' src: Ox.PATH + 'png/Ox.UI/videoMarker' + titleCase + '.png'
}) })
.appendTo(that.$element); .appendTo(that.$element);
setMarkerPoint(i); setMarkerPoint(i);

2
source/js/Ox.UI/Video/Ox.VideoEditorPlayer.js
View file

@ -92,7 +92,7 @@ Ox.VideoEditorPlayer = function(options, self) {
self.$markerPoint[point][edge] = $('<img>') self.$markerPoint[point][edge] = $('<img>')
.addClass('OxMarkerPoint OxMarker' + titleCase) .addClass('OxMarkerPoint OxMarker' + titleCase)
.attr({ .attr({
src: Ox.UI.PATH + 'png/ox.ui/videoMarker' + titleCase + '.png' src: Ox.PATH + 'png/Ox.UI/videoMarker' + titleCase + '.png'
}) })
.hide() .hide()
.appendTo(that.$element); .appendTo(that.$element);