0x2620/pandora
2
1
Fork 1
Code Issues 1.2k Pull requests Releases Wiki Activity

first round of makeing png/js/script/config overwrite more consistent

Browse source
This commit is contained in:
j 2012-04-20 12:22:32 +02:00
commit e5da40a104
49 changed files with 860 additions and 67 deletions
Download patch file Download diff file Expand all files Collapse all files

2
static/favicon.ico
View file

@ -1 +1 @@
png/icon16.png
png/icon.png

2
static/html/50x.html
View file

@ -12,7 +12,7 @@
</style>
</head>
<body class="OxThemeModern">
<img src="/static/png/logo256.png" style="width: 320px; padding-top: 160px"/>
<img src="/static/png/logo.png" style="width: 320px; padding-top: 160px"/>
<div style="padding-top: 16px">We will be back in a moment.</div>
</body>
</html>

4
static/js/pandora.js
View file

@ -75,7 +75,7 @@ appPanel
images.reflection.style.MozTransform = 'scaleY(-1)';
images.reflection.style.OTransform = 'scaleY(-1)';
images.reflection.style.WebkitTransform = 'scaleY(-1)';
images.reflection.src = '/static/png/logo256.png';
images.reflection.src = '/static/png/logo.png';
images.loadingIcon = document.createElement('img');
images.loadingIcon.setAttribute('id', 'loadingIcon');
images.loadingIcon.style.position = 'absolute';
@ -90,7 +90,7 @@ appPanel
+ '/Ox.UI/themes/' + theme + '/svg/symbolLoadingAnimated.svg';
callback(images);
};
images.logo.src = '/static/png/logo256.png';
images.logo.src = '/static/png/logo.png';
}
function loadScreen(images) {

6
static/js/pandora/account.js
View file

@ -94,7 +94,7 @@ pandora.ui.accountDialogOptions = function(action, value) {
content: Ox.Element()
.append(
$('<img>')
.attr({src: '/static/png/icon64.png'})
.attr({src: '/static/png/icon.png'})
.css({position: 'absolute', left: '16px', top: '16px', width: '64px', height: '64px'})
)
.append(
@ -335,7 +335,7 @@ pandora.ui.accountSignoutDialog = function() {
content: Ox.Element()
.append(
$('<img>')
.attr({src: '/static/png/icon64.png'})
.attr({src: '/static/png/icon.png'})
.css({position: 'absolute', left: '16px', top: '16px', width: '64px', height: '64px'})
)
.append(
@ -374,7 +374,7 @@ pandora.ui.accountWelcomeDialog = function() {
content: Ox.Element()
.append(
$('<img>')
.attr({src: '/static/png/icon64.png'})
.attr({src: '/static/png/icon.png'})
.css({position: 'absolute', left: '16px', top: '16px', width: '64px', height: '64px'})
)
.append(

2
static/js/pandora/allItems.js
View file

@ -21,7 +21,7 @@ pandora.ui.allItems = function() {
}
}),
$icon = $('<img>')
.attr({src: '/static/png/icon16.png'})
.attr({src: '/static/png/icon.png'})
.css({float: 'left', width: '14px', height: '14px', margin: '1px'})
.appendTo(that),
$name = $('<div>')

2
static/js/pandora/annotationDialog.js
View file

@ -26,7 +26,7 @@ pandora.ui.annotationDialog = function(layer) {
content: Ox.Element()
.append(
$('<img>')
.attr({src: '/static/png/icon64.png'})
.attr({src: '/static/png/icon.png'})
.css({position: 'absolute', left: '16px', top: '16px', width: '64px', height: '64px'})
)
.append(

2
static/js/pandora/contactForm.js
View file

@ -120,7 +120,7 @@ pandora.ui.contactForm = function() {
content: Ox.Element()
.append(
$('<img>')
.attr({src: '/static/png/icon64.png'})
.attr({src: '/static/png/icon.png'})
.css({position: 'absolute', left: '16px', top: '16px', width: '64px', height: '64px'})
)
.append(

2
static/js/pandora/deleteItemDialog.js
View file

@ -31,7 +31,7 @@ pandora.ui.deleteItemDialog = function(item) {
content: Ox.Element()
.append(
$('<img>')
.attr({src: '/static/png/icon64.png'})
.attr({src: '/static/png/icon.png'})
.css({position: 'absolute', left: '16px', top: '16px', width: '64px', height: '64px'})
)
.append(

2
static/js/pandora/deleteListDialog.js
View file

@ -45,7 +45,7 @@ pandora.ui.deleteListDialog = function(list) {
content: Ox.Element()
.append(
$('<img>')
.attr({src: '/static/png/icon64.png'})
.attr({src: '/static/png/icon.png'})
.css({position: 'absolute', left: '16px', top: '16px', width: '64px', height: '64px'})
)
.append(

4
static/js/pandora/error.js
View file

@ -26,7 +26,7 @@ pandora.ui.errorDialog = function(data) {
content: Ox.Element()
.append(
$('<img>')
.attr({src: '/static/png/icon64.png'})
.attr({src: '/static/png/icon.png'})
.css({position: 'absolute', left: '16px', top: '16px', width: '64px', height: '64px'})
)
.append(
@ -66,7 +66,7 @@ pandora.ui.errorDialog = function(data) {
content: Ox.Element()
.append(
$('<img>')
.attr({src: '/static/png/icon64.png'})
.attr({src: '/static/png/icon.png'})
.css({position: 'absolute', left: '16px', top: '16px', width: '64px', height: '64px'})
)
.append(

2
static/js/pandora/folderBrowserList.js
View file

@ -11,7 +11,7 @@ pandora.ui.folderBrowserList = function(id) {
clickable: true,
format: function(value) {
return $('<img>').attr({
src: '/list/' + value + '/icon16.jpg'
src: '/list/' + value + '/icon.jpg'
}).css({
width: '14px',
height: '14px',

2
static/js/pandora/folderList.js
View file

@ -14,7 +14,7 @@ pandora.ui.folderList = function(id) {
},
format: function(value, data) {
return $('<img>').attr({
src: '/list/' + data.id + '/icon16.jpg'
src: '/list/' + data.id + '/icon.jpg'
}).css({
width: '14px',
height: '14px',

2
static/js/pandora/folders.js
View file

@ -304,7 +304,7 @@ pandora.ui.folders = function() {
content: Ox.Element()
.append(
$('<img>')
.attr({src: '/static/png/icon64.png'})
.attr({src: '/static/png/icon.png'})
.css({position: 'absolute', left: '16px', top: '16px', width: '64px', height: '64px'})
)
.append(

4
static/js/pandora/home.js
View file

@ -14,7 +14,7 @@ pandora.ui.home = function() {
zIndex: 1001
}),
$reflectionImage = $('<img>')
.attr({src: '/static/png/logo256.png'})
.attr({src: '/static/png/logo.png'})
.css({
position: 'absolute',
left: 0,
@ -45,7 +45,7 @@ pandora.ui.home = function() {
$logo = $('<img>')
.attr({
id: 'logo',
src: '/static/png/logo256.png'
src: '/static/png/logo.png'
})
.css({
position: 'absolute',

4
static/js/pandora/home.padma.js
View file

@ -26,7 +26,7 @@ pandora.ui.home = function() {
})
.appendTo(that),
$reflectionImage = $('<img>')
.attr({src: '/static/png/logo256.png'})
.attr({src: '/static/png/logo.png'})
.css({
position: 'absolute',
left: 0,
@ -55,7 +55,7 @@ pandora.ui.home = function() {
$logo = $('<img>')
.attr({
id: 'logo',
src: '/static/png/logo256.png'
src: '/static/png/logo.png'
})
.css({
position: 'absolute',

2
static/js/pandora/homePage.js
View file

@ -32,7 +32,7 @@ pandora.ui.homePage = function() {
.html('right')
.appendTo(that.$element),
$logo = $('<img>')
.attr({src: '/static/png/logo256.png'})
.attr({src: '/static/png/logo.png'})
.appendTo($center);
// fixme: duplicated
$select = Ox.Select({

2
static/js/pandora/listDialog.js
View file

@ -475,7 +475,7 @@ pandora.ui.listIconPanel = function(listData) {
pandora.$ui.folderList[listData.folder].$element
.find('img[src*="/' + listData.id + '/"]')
.attr({
src: '/list/' + listData.id + '/icon16.jpg?' + Ox.uid()
src: '/list/' + listData.id + '/icon.jpg?' + Ox.uid()
});
pandora.$ui.info.updateListInfo();
});

2
static/js/pandora/makeListPrivateDialog.js
View file

@ -26,7 +26,7 @@ pandora.ui.makeListPrivateDialog = function(name, subscribers, callback) {
content: Ox.Element()
.append(
$('<img>')
.attr({src: '/static/png/icon64.png'})
.attr({src: '/static/png/icon.png'})
.css({position: 'absolute', left: '16px', top: '16px', width: '64px', height: '64px'})
)
.append(

2
static/js/pandora/preferencesDialog.js
View file

@ -12,7 +12,7 @@ pandora.ui.preferencesDialog = function() {
.css({overflowY: 'auto'})
.append(
$('<img>')
.attr({src: '/static/png/icon64.png'})
.attr({src: '/static/png/icon.png'})
.css({position: 'absolute', left: '16px', top: '16px'})
);
if (id == 'account') {

4
static/js/pandora/siteDialog.js
View file

@ -97,8 +97,8 @@ pandora.ui.siteDialog = function(section) {
.append(
$('<img>')
.attr({src: '/static/png/' + (
id == 'software' ? 'pandora/icon' : 'logo'
) + '256.png'})
id == 'software' ? 'software.png' : 'logo.png'
)})
.css({width: '256px'})
),
size: 272

2
static/js/pandora/tv.js
View file

@ -59,7 +59,7 @@ pandora.ui.tv = function() {
duration: result.data.duration,
enableSubtitles: pandora.user.ui.videoSubtitles,
fullscreen: true,
logo: pandora.site.tv.showLogo ? '/static/png/logo256.png' : '',
logo: pandora.site.tv.showLogo ? '/static/png/logo.png' : '',
muted: muted || pandora.user.ui.videoMuted,
position: result.data.position,
resolution: pandora.user.ui.videoResolution,

2
static/js/pandora/usersDialog.js
View file

@ -888,7 +888,7 @@ pandora.ui.usersDialog = function() {
content: Ox.Element()
.append(
$('<img>')
.attr({src: '/static/png/icon64.png'})
.attr({src: '/static/png/icon.png'})
.css({position: 'absolute', left: '16px', top: '16px', width: '64px', height: '64px'})
)
.append(

BIN
static/png/icon.0xdb.org Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 16 KiB

BIN
static/png/icon.padma.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 13 KiB

0
static/png/pandora/icon256.png → static/png/icon.pandora.png
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 54 KiB

After

Width:  |  Height:  |  Size: 54 KiB

Before After
Before After

BIN
static/png/logo.0xdb.org Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 32 KiB

BIN
static/png/logo.padma.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 46 KiB

0
static/png/pandora/logo256.png → static/png/logo.pandora.png
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 33 KiB

After

Width:  |  Height:  |  Size: 33 KiB

Before After
Before After

BIN
static/png/pandora/icon16.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 3.4 KiB

BIN
static/png/pandora/icon64.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 7.4 KiB

BIN
static/png/rights.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 158 KiB

BIN
static/png/software.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 54 KiB