rendered paste bodydiff --cc web/skins/beech/cedar/js/javascript.jsindex 2bd07be,028f3e8..0000000--- a/web/skins/beech/cedar/js/javascript.js+++ b/web/skins/beech/cedar/js/javascript.js@@@ -20,22 -20,8 +20,18 @@@ $(function() }; resizeRightTray();- // Hide notification icon if not available on a page- if (!$(".notify").html().length > 0) {- $(".notify").hide();- }- if ($('#deki-page-alerts').hasClass('disabled')) {- $(".notify").hide();- }- // SHOW LOGIN FORM++<<<<<<< HEAD + var showLoginForm = function() { + $('#login-link').hide(); + $('#forgot-password-link').css('display', 'inline'); + $(".user-nav form").fadeIn(function() { + $('#username').focus(); + }); + };++=======+++>>>>>>> origin/master // ... but first detect support for the placeholder attribute var placeHolderSupport = ("placeholder" in document.createElement("input")); if (!placeHolderSupport) {@@@ -44,7 -30,12 +40,16 @@@ $(".login-link").click(function(e) { e.preventDefault();++<<<<<<< HEAD + showLoginForm();++=======++ $('#login-link').hide();+ $('#forgot-password-link').css('display', 'inline');+ $(".user-nav form").fadeIn(function() {+ $('#username').focus();+ });++>>>>>>> origin/master }); // Reset Text Inputs@@@ -86,67 -77,60 +91,117 @@@ //d.css("marginLeft",m); d.slideDown('fast'); }); - + // Button CSS for deeply rooted buttons++<<<<<<< HEAD + $("input[type=submit]").addClass("btn"); + $("input[type=button]").addClass("btn"); + $(".commentActions input").addClass("btn"); + $(".commentActions a").addClass("btn"); + $("#deki-page-alerts div.toggle a").attr("title","Receive Notifications"); + $(".page a.disabled").parent().hide(); + + $('.in-page-sign-in').live('click', function(e) { + e.preventDefault(); + showLoginForm(); + $('html, body').animate({scrollTop:0}, 'fast'); + }); + + // Widget display + $("#widget-tips").click( function() { + $(".widget-tips").show(); + $(".widget-tabs > ul > li").removeClass("active"); + $(this).parent("li").addClass("active"); + $(".widget-related, .widget-answers, .widget-comments, .widget-files").hide(); + }); + $("#widget-related").click( function() { + $(".widget-related").show(); + $(".widget-tabs > ul > li").removeClass("active"); + $(this).parent("li").addClass("active"); + $(".widget-tips, .widget-answers, .widget-comments, .widget-files").hide(); + }); + $("#widget-answers").click( function() { + $(".widget-answers").show(); + $(".widget-tabs > ul > li").removeClass("active"); + $(this).parent("li").addClass("active"); + $(".widget-tips, .widget-related, .widget-comments, .widget-files").hide(); + }); + $("#widget-comments").click( function() { + $(".widget-comments").show(); + $(".widget-tabs > ul > li").removeClass("active"); + $(this).parent("li").addClass("active"); + $(".widget-tips, .widget-related, .widget-answers, .widget-files").hide(); + }); + $("#widget-files").click( function() { + $(".widget-files").show(); + $(".widget-tabs > ul > li").removeClass("active"); + $(this).parent("li").addClass("active"); + $(".widget-tips, .widget-related, .widget-answers, .widget-comments").hide(); + }); + + // File attachment title + $('.file-link a').each(function() { + var $this = $(this); + if($this.text().length > 25){ + $this.text($this.text().slice(0,25)).append('...'); + } + }); + + // Success message fadeout++=======+ $("input[type=submit]").addClass("btn");+ $("input[type=button]").addClass("btn");+ $(".commentActions input").addClass("btn");+ $(".commentActions a").addClass("btn");+ $("#deki-page-alerts div.toggle a").attr("title","Receive Notifications");+ $(".page a.disabled").parent().hide();++ // Widget display+ $("#widget-tips").click( function() {+ $(".widget-tips").show();+ $(".widget-tabs > ul > li").removeClass("active");+ $(this).parent("li").addClass("active");+ $(".widget-related, .widget-answers, .widget-comments, .widget-files").hide();+ });+ $("#widget-related").click( function() {+ $(".widget-related").show();+ $(".widget-tabs > ul > li").removeClass("active");+ $(this).parent("li").addClass("active");+ $(".widget-tips, .widget-answers, .widget-comments, .widget-files").hide();+ });+ $("#widget-answers").click( function() {+ $(".widget-answers").show();+ $(".widget-tabs > ul > li").removeClass("active");+ $(this).parent("li").addClass("active");+ $(".widget-tips, .widget-related, .widget-comments, .widget-files").hide();+ });+ $("#widget-comments").click( function() {+ $(".widget-comments").show();+ $(".widget-tabs > ul > li").removeClass("active");+ $(this).parent("li").addClass("active");+ $(".widget-tips, .widget-related, .widget-answers, .widget-files").hide();+ });+ $("#widget-files").click( function() {+ $(".widget-files").show();+ $(".widget-tabs > ul > li").removeClass("active");+ $(this).parent("li").addClass("active");+ $(".widget-tips, .widget-related, .widget-answers, .widget-comments").hide();+ });++ // File attachment title+ $('.file-link a').each(function() {+ var $this = $(this);+ if($this.text().length > 25){+ $this.text($this.text().slice(0,25)).append('...');+ }+ });+ // Success message fadeout++>>>>>>> origin/master if ($(".successmsg")) { - setTimeout(function() { - $(".successmsg").animate({ height: 'hide', opacity: 'hide', queue: false }, 500); - $(".successmsg .flashMsg").animate({ height: 'hide', opacity: 'hide', queue: false }, 500); - }, 5000); + setTimeout(function() { + $(".successmsg").animate({ height: 'hide', opacity: 'hide', queue: false }, 500); + $(".successmsg .flashMsg").animate({ height: 'hide', opacity: 'hide', queue: false }, 500); + }, 5000); } // Adds delete to all flash messages