Commit 57607998 authored by yPhil's avatar yPhil

UI: No wrapping tabs

parent 2f4e3f4a
This diff is collapsed.
......@@ -9,6 +9,10 @@
"start": "node ./bin/www",
"postinstall": "bower install"
},
"devDependencies": {
"mocha": "latest",
"should": "latest"
},
"dependencies": {
"body-parser": "~1.18.2",
"bower": "^1.3.2",
......
......@@ -409,3 +409,19 @@ i.dangerous:hover {
.arrow {
background-image: url("/static/images/feed-toggle-triangle-000.png");
}
#tabs {
white-space: nowrap;
overflow: hidden;
}
#tabs ul li {
display: inline-block;
float: none;
vertical-align: bottom;
}
.tabSort {
white-space: initial;
}
......@@ -87,7 +87,7 @@ MOB.dialog = {
var $feed = $dataStore.parent().parent();
$dialog.dialog({
title: MOB.tr('Feed: Parameters'),
title: MOB.tr('Source'),
autoOpen: false,
closeOnEscape: true,
resizable: true,
......
......@@ -83,13 +83,13 @@ MOB.feed = {
$header.hover (
function() {
$(this).find('.feedControls').slideDown('fast');
var iconImg = $feedToggle.css('background-image');
$feedToggle.addClass('arrow');
$(this).data('img',iconImg);
$(this).find('.feedControls').slideDown('fast');
},
function() {
$(this).find('.feedControls').slideUp('slow');
......@@ -101,7 +101,6 @@ MOB.feed = {
} else {
$feedToggle.addClass('generic');
}
}
);
......@@ -178,6 +177,15 @@ MOB.feed = {
var feedHost = l.protocol + '//' + l.hostname;
// const myurl = new URL(feedUrl);
const subdomain = l.hostname.substr(0, l.hostname.indexOf('.'));
if (subdomain === 'rss' || subdomain === 'feeds') {
feedHost = l.protocol + '//' + l.hostname.replace(subdomain + '.', '')
}
console.log('HOST: (%s)', feedHost);
$refreshButton.addClass('spinner');
$feed.children('.mobHeader').removeClass('ui-state-error');
......@@ -186,6 +194,9 @@ MOB.feed = {
dataType: "json",
timeout: 2000
}, function(icon) {
if (icon) console.log('I: (%s)', icon);
if ( !icon || icon.length === 0) icon = '/static/images/feed-generic-rss.png';
}).done(function(icon) {
// console.log( 'DONE %s OK (status %s)', icon, status);
......@@ -193,7 +204,7 @@ MOB.feed = {
$header.data('img',icon);
}).fail(function(icon, status) {
// console.info('Bad favicon: %s (status: %s)', feedHost, status);
console.info('Bad favicon: %s (status: %s)', feedHost, status);
$feedIcon.css('background-image','url("/static/images/feed-generic-rss.png")');
}).always(function() {
......@@ -213,7 +224,7 @@ MOB.feed = {
// console.log( "\nDATA: (%s)", JSON.stringify(data.error));
if (data.error) {
console.info('bad Feed: (%s) error: %s', feedUrl, data.error);
// console.info('bad Feed: (%s) error: %s', feedUrl, data.error);
$header.addClass('ui-state-error');
$feedTitle
......
This diff is collapsed.
......@@ -173,7 +173,7 @@ $('<div id="menu">').appendTo($('body')).load('/static/templates/menu.html', fun
console.log('JSON!');
} else {
console.log('NOT JSON!');
MOB.utilities.notify('error', MOB.tr('This file is bad'));
MOB.utilities.notify('error', MOB.tr('This file is bad: Not JSON'));
return;
}
......@@ -206,7 +206,7 @@ $('<div id="menu">').appendTo($('body')).load('/static/templates/menu.html', fun
if (IsJsonString(y)) {
p = JSON.parse(y);
} else {
MOB.utilities.notify('error', MOB.tr('This file is bad'));
MOB.utilities.notify('error', MOB.tr('This file is bad: parsing'));
}
// console.log('p Is array: %s', isOk(p));
......@@ -215,7 +215,7 @@ $('<div id="menu">').appendTo($('body')).load('/static/templates/menu.html', fun
MOB.utilities.notify('success', MOB.tr('This file is fine'));
MOB.tab.populate(p, true);
} else {
MOB.utilities.notify('error', MOB.tr('This file is bad'));
MOB.utilities.notify('error', MOB.tr('This file is bad: Not OK'));
}
// console.log('Is Valid: %s', isValid)
......
......@@ -90,8 +90,8 @@ MOB.tab = {
var $newFeedButton = $('<div>')
.html('<i class="icon-plus-1 rotate"></i>')
.attr('class', 'handle newFeed ui-corner-left translate')
.data('title', MOB.tr('Add a new feed to [%1]', name))
.attr('title', MOB.tr('Add a new feed to [%1]', name));
.data('title', MOB.tr('Add a new source to [%1]', name))
.attr('title', MOB.tr('Add a new source to [%1]', name));
$newFeedButton.on("click", function() {
MOB.feed.make($sortable, 'New Feed', 'mixed', 8, true);
......
......@@ -33,9 +33,9 @@
<div id="feedPrefs">
<form>
<fieldset class="ui-widget ui-widget-content ui-corner-all">
<legend data-title="Location (URL)"
data-content="Location (URL)"
class="ui-corner-top translate">Location (URL)</legend>
<legend data-title="Source Location (URL)"
data-content="Source Location (URL)"
class="ui-corner-top translate">Source Location (URL)</legend>
<div id="feedGuess" class="flexBox">
<input name="guess"
......@@ -58,9 +58,9 @@
<fieldset id="feedType" class="prefsForm ui-widget ui-widget-content ui-corner-all">
<legend data-title="Feed Type"
data-content="Feed Type"
class="ui-corner-top translate">Feed Type
<legend data-title="Source Type"
data-content="Source Type"
class="ui-corner-top translate">Source Type
</legend>
<div id="feedTitle"
......
......@@ -134,7 +134,8 @@
<script src="/static/lib/js/utilities.js"></script>
<div id="preloaded-images">
<img src="/static/images/feed-toggle-triangle.png" width="1" height="1" alt="Image 01" />
<img src="/static/images/feed-toggle-triangle-fff.png" width="1" height="1" alt="Image 01" />
<img src="/static/images/feed-toggle-triangle-000.png" width="1" height="1" alt="Image 02" />
</div>
</body>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment