rainbownapkin/fore.st
1
0
Fork 0
Code Issues 13 Pull requests Projects Releases Packages Wiki Activity Actions

Fixes

Browse source
This commit is contained in:
calzoneman 2014-02-24 18:25:49 -06:00
parent cc241da5cf
commit 5d9a8a1a3f
10 changed files with 54 additions and 43 deletions
Download patch file Download diff file Expand all files Collapse all files

2
www/js/callbacks.js
View file

@ -908,7 +908,7 @@ Callbacks = {
$(li).appendTo($("#library"));
},
itemsPerPage: 10
itemsPerPage: 100
};
var p = Paginate(data.results, opts);

18
www/js/data.js
View file

@ -9,7 +9,7 @@ The above copyright notice and this permission notice shall be included in all c
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.
*/
var CL_VERSION = "3.0.0";
var CL_VERSION = 3.0;
var CLIENT = {
rank: -1,
@ -99,9 +99,8 @@ function getOrDefault(k, def) {
}
var USEROPTS = {
theme : getOrDefault("theme", "default"),
css : getOrDefault("css", ""),
layout : getOrDefault("layout", "default"),
theme : getOrDefault("theme", "/css/themes/slate.css"),
layout : getOrDefault("layout", "fluid"),
synch : getOrDefault("synch", true),
hidevid : getOrDefault("hidevid", false),
show_timestamps : getOrDefault("show_timestamps", true),
@ -164,5 +163,16 @@ function eraseCookie(name) {
createCookie(name,"",-1);
}
(function () {
var localVersion = parseFloat(getOpt("version"));
if (isNaN(localVersion)) {
USEROPTS.theme = "/css/themes/slate.css";
USEROPTS.layout = "fluid";
setOpt("theme", "/css/themes/slate.css");
setOpt("layout", "fluid");
setOpt("version", CL_VERSION);
}
})();
/* to be implemented in callbacks.js */
function setupCallbacks() { }

5
www/js/theme.js
View file

@ -3,7 +3,7 @@
return s.trim();
});
var theme = "default";
var theme = "/css/themes/slate.css";
for (var i = 0; i < c.length; i++) {
if (c[i].indexOf("cytube-theme=") === 0) {
theme = c[i].split("=")[1];
@ -11,7 +11,8 @@
}
}
if (theme !== "default") {
if (theme !== "/css/themes/slate.css") {
console.log("THEME COOKIE:", theme);
var cur = document.getElementById("usertheme");
cur.parentNode.removeChild(cur);
var css = document.createElement("link");

2
www/js/util.js
View file

@ -662,7 +662,7 @@ function applyOpts() {
$("#usertheme").remove();
var theme = USEROPTS.theme;
if (theme === "default") {
theme = "/css/themes/default.css";
theme = "/css/themes/slate.css";
}
$("<link/>").attr("rel", "stylesheet")
.attr("type", "text/css")