diff --git a/app/assets/images/background.jpg b/app/assets/images/background.jpg new file mode 100644 index 00000000..380ede29 Binary files /dev/null and b/app/assets/images/background.jpg differ diff --git a/app/assets/images/orbit-bar.png b/app/assets/images/orbit-bar.png index d8e36223..5509c2e9 100644 Binary files a/app/assets/images/orbit-bar.png and b/app/assets/images/orbit-bar.png differ diff --git a/app/assets/images/sign-in-logo.png b/app/assets/images/sign-in-logo.png new file mode 100644 index 00000000..53756c7c Binary files /dev/null and b/app/assets/images/sign-in-logo.png differ diff --git a/app/assets/images/sign-in-logo2.png b/app/assets/images/sign-in-logo2.png new file mode 100644 index 00000000..45505f24 Binary files /dev/null and b/app/assets/images/sign-in-logo2.png differ diff --git a/app/assets/javascripts/devise.js.erb b/app/assets/javascripts/devise.js.erb new file mode 100644 index 00000000..c6412f9a --- /dev/null +++ b/app/assets/javascripts/devise.js.erb @@ -0,0 +1,7 @@ +// This is a manifest file that'll be compiled into including all the files listed below. +// Add new JavaScript/Coffee code in separate files in this directory and they'll automatically +// be included in the compiled file accessible from http://example.com/assets/application.js +// It's not advisable to add code directly here, but if you do, it'll appear at the bottom of the +// the compiled file. +// +//= require new_admin \ No newline at end of file diff --git a/app/assets/javascripts/orbit-1.0.js b/app/assets/javascripts/orbit-1.0.js index c7eb13b6..e7077dcc 100644 --- a/app/assets/javascripts/orbit-1.0.js +++ b/app/assets/javascripts/orbit-1.0.js @@ -1,6 +1,6 @@ -var viewportwidth; -var viewportheight; -function resize(){ +var viewportwidth, + viewportheight; +function resize() { viewportheight=$(window).height(); viewportwidth=$(window).width(); if(window.navigator.userAgent.indexOf("MSIE")>0){ @@ -9,32 +9,47 @@ function resize(){ } } $(document).ready(function(){ + $('.orbit-bar-member').live('click', function(){ + $(this).hasClass('open') ? $(this).removeClass('open') : $(this).addClass('open'); + $('.bar-login .dropdown-menu').toggle(); + return false; + }); + + $(document).click(function() { + $('.orbit-bar-member').removeClass("open"); + $('.bar-login .dropdown-menu').hide(); + }); + + $('.dropdown-menu').live('click', function(e) { + e.stopPropagation(); + $('.bar-login .dropdown-menu').show(); + }); $('.tip').tooltip({ placement: "left" }); - $(function() { - var $role = $('.select-role'); - $('.privacy').each(function($i) { - $(this).click(function() { - switch ($i) { - case 0: - $role.slideUp(300); - break; - case 1: - $role.slideDown(300); - break; - } - }); + var $role = $('.select-role'); + $('.privacy').each(function($i) { + $(this).click(function() { + switch ($i) { + case 0: + $role.slideUp(300); + break; + case 1: + $role.slideDown(300); + break; + } }); }); + /*tinyscrollbar&windows-Size*/ resize(); $('#main-sidebar').css("height", viewportheight-40); //$('#content-wrap .viewport').css("height", viewportheight-44); //$('#content-wrap').css("width", viewportwidth-186); $('#main-sidebar .viewport').css("height", viewportheight-40); + $('.post-title').css("width", viewportwidth-495); $('#main-sidebar').tinyscrollbar(); $('#main-sidebar').tinyscrollbar({ size:(viewportheight-44)}); @@ -44,5 +59,6 @@ $(window).resize(function(){ resize(); $('#main-sidebar').css("height", viewportheight-40); $('#main-sidebar .viewport').css("height", viewportheight-40); + $('.post-title').css("width", viewportwidth-495); $('#main-sidebar').tinyscrollbar({ size:(viewportheight-44)}); -}); \ No newline at end of file +}); diff --git a/app/assets/javascripts/orbit_bar.js b/app/assets/javascripts/orbit_bar.js index 3c0c6cb3..06c3113d 100644 --- a/app/assets/javascripts/orbit_bar.js +++ b/app/assets/javascripts/orbit_bar.js @@ -1,4 +1,7 @@ $(document).ready(function() { - $('body').prepend("
"); - ajax_load_proc($('#orbit_bar'), '/load_orbit_bar'); + $('body').prepend("
"); + $("#orbit_bar_temp").load('/load_orbit_bar',function(){ + $('body').prepend($(this).html()); + $(this).remove(); + }); }); \ No newline at end of file diff --git a/app/assets/stylesheets/bootstrap-orbit.css b/app/assets/stylesheets/bootstrap-orbit.css index fa08eb24..88bca1b3 100644 --- a/app/assets/stylesheets/bootstrap-orbit.css +++ b/app/assets/stylesheets/bootstrap-orbit.css @@ -16,8 +16,8 @@ h1, h2, h3, h4, h5, h6 { box-shadow: 0 1px 1px rgba(0, 0, 0, 0.5) inset; padding:9px; } -hr { - margin: 5px 0; +.qe-block hr { + margin: 5px 10px 5px 0; } .label-tags { background-color: #FF5B00; @@ -31,10 +31,6 @@ hr { .dropdown-menu { min-width: 90px; } -.form-horizontal .form-actions { - text-align:right; -} - .subhead { padding-bottom: 0; margin-bottom: 9px; @@ -105,4 +101,7 @@ table .span1-2 { width: 94px; float: none; margin-left: 0; +} +.qe-block .form-horizontal .form-actions { + text-align:right; } \ No newline at end of file diff --git a/app/assets/stylesheets/bootstrap.css.erb b/app/assets/stylesheets/bootstrap.css.erb index 54201520..93b1e45b 100644 --- a/app/assets/stylesheets/bootstrap.css.erb +++ b/app/assets/stylesheets/bootstrap.css.erb @@ -96,7 +96,7 @@ textarea { } body { margin: 0; - font-family: "Helvetica Neue", Helvetica, Arial, sans-serif; + font-family: /*"Helvetica Neue", */Helvetica, Arial, sans-serif; font-size: 13px; line-height: 18px; color: #333333; @@ -1119,7 +1119,7 @@ table .span12 { width: 14px; height: 14px; vertical-align: text-top; - background-image: url(<%= asset_path "glyphicons-halflings.png" %>); + background-image: url(<%= asset_path 'glyphicons-halflings.png' %>); background-position: 14px 14px; background-repeat: no-repeat; *margin-right: .3em; @@ -1128,7 +1128,7 @@ table .span12 { *margin-left: 0; } .icon-white { - background-image: url(<%= asset_path "glyphicons-halflings-white.png" %>); + background-image: url(<%= asset_path 'glyphicons-halflings-white.png' %>); } .icon-glass { background-position: 0 0; diff --git a/app/assets/stylesheets/devise.css b/app/assets/stylesheets/devise.css deleted file mode 100644 index 416fd8dd..00000000 --- a/app/assets/stylesheets/devise.css +++ /dev/null @@ -1,10 +0,0 @@ -ul.hmenu { - list-style: none; - margin: 0 0 2em; - padding: 0; - text-align: right; -} - -ul.hmenu li { - display: inline; -} \ No newline at end of file diff --git a/app/assets/stylesheets/devise.css.erb b/app/assets/stylesheets/devise.css.erb new file mode 100644 index 00000000..e9bad0ed --- /dev/null +++ b/app/assets/stylesheets/devise.css.erb @@ -0,0 +1,6 @@ +/* + *This is a manifest file that'll automatically include all the stylesheets available in this directory + *and any sub-directories. You're free to add application-wide styles to this file and they'll appear at + *the top of the compiled file, but it's generally better to create a new file per style scope. + *= require new_admin +*/ \ No newline at end of file diff --git a/app/assets/stylesheets/list.css b/app/assets/stylesheets/list.css index 19b82081..66e0bfb3 100644 --- a/app/assets/stylesheets/list.css +++ b/app/assets/stylesheets/list.css @@ -11,6 +11,10 @@ } .main-list thead th { background-color: rgba(0,0,0,0.05); + border-right: 1px solid #ddd; +} +.main-list thead th:last-child { + border-right: none; } .main-list .span1 { min-width: 32px; @@ -28,9 +32,9 @@ height:40px; } .main-list tbody .quick-edit .nav { - left: -55px; + /*left: -55px;*/ position: absolute; - top: -3px; + /*top: -3px;*/ width: 350px; } .main-list td { @@ -43,8 +47,52 @@ .main-list tr:hover .hide { display:block !important; } +.main-list .label-group { + position: relative; + height: 40px; +} +.main-list .label-td { + background-color: rgba(255, 255, 255, 1); + height: 60px; + overflow: hidden; + position: absolute; + width: 100%; + left: 0; + z-index: 1; +} +.main-list .label-td:hover { + height: auto; + text-align: center; + padding: 5px 5px 8px; + left: -6px; + top: -6px; + border: 1px solid rgba(0, 0, 0, 0.2); + box-shadow: 0px 5px 10px rgba(0,0,0,0.2); + -moz-box-shadow: 0px 5px 10px rgba(0,0,0,0.2); + -webkit-box-shadow: 0px 5px 10px rgba(0,0,0,0.2); + border-radius: 3px; + -webkit-border-radius: 3px; + -moz-border-radius: 3px; + z-index: 5; +} +.route-group .route { + padding: 0; +} +.route-group .route .breadcrumb { + border-width: 0!important; +} .qe-block td { height:auto; + padding: 0; +} +.qe-block .table td, .qe-block .table th { + padding: 8px; +} +.qe-block .form-horizontal { + margin-bottom: 0; +} +.qe-block .form-actions { + margin-bottom: 0; } legend { font-size: 15px; diff --git a/app/assets/stylesheets/reset.css b/app/assets/stylesheets/reset.css deleted file mode 100644 index 5a193676..00000000 --- a/app/assets/stylesheets/reset.css +++ /dev/null @@ -1,15 +0,0 @@ -html, body, div, span, applet, object, iframe, h1, h2, h3, h4, h5, h6, p, blockquote, pre, a, abbr, acronym, address, big, cite, code, del, dfn, em, img, ins, kbd, q, s, samp, small, strike, strong, sub, sup, tt, var, b, u, i, center, dl, dt, dd, ol, ul, li, fieldset, form, label, legend, table, caption, tbody, tfoot, thead, tr, th, td, article, aside, canvas, details, embed, figure, figcaption, footer, header, hgroup, menu, nav, output, ruby, section, summary, time, mark, audio, video { - -webkit-text-size-adjust:none; -} -/*自定*/ -input:focus, select:focus, textarea:focus { - outline:none; - -moz-outline-radius: 0; -} -.clear:after { - content:"."; - clear:both; - display:block; - height:0; - visibility:hidden; -} \ No newline at end of file diff --git a/app/assets/stylesheets/reset.css.erb b/app/assets/stylesheets/reset.css.erb index 44f2ae77..0d91f32a 100644 --- a/app/assets/stylesheets/reset.css.erb +++ b/app/assets/stylesheets/reset.css.erb @@ -1,34 +1,9 @@ html, body, div, span, applet, object, iframe, h1, h2, h3, h4, h5, h6, p, blockquote, pre, a, abbr, acronym, address, big, cite, code, del, dfn, em, img, ins, kbd, q, s, samp, small, strike, strong, sub, sup, tt, var, b, u, i, center, dl, dt, dd, ol, ul, li, fieldset, form, label, legend, table, caption, tbody, tfoot, thead, tr, th, td, article, aside, canvas, details, embed, figure, figcaption, footer, header, hgroup, menu, nav, output, ruby, section, summary, time, mark, audio, video { - margin: 0; - padding: 0; - border: 0; - font-size: 100%; - font: inherit; - vertical-align: baseline; + -webkit-text-size-adjust:none; } -/* HTML5 display-role reset for older browsers */ -article, aside, details, figcaption, figure, footer, header, hgroup, menu, nav, section { - display: block; -} -a { - text-decoration:none; -} -body { - line-height: 1; -} -ol, ul { - list-style: none; -} -blockquote, q { - quotes: none; -} -blockquote:before, blockquote:after, q:before, q:after { - content: ''; - content: none; -} -table { - border-collapse: collapse; - border-spacing: 0; +html, body{ + background: url(<%= asset_path 'background.jpg' %>) repeat left top; + height: 100%; } /*自定*/ input:focus, select:focus, textarea:focus { @@ -42,3 +17,7 @@ input:focus, select:focus, textarea:focus { height:0; visibility:hidden; } +a:link, a:hover, a:visited, a:active { + outline: none; /* for Firefox */ + hlbr:expression(this.onFocus=this.blur()); /* for IE */ +} \ No newline at end of file diff --git a/app/assets/stylesheets/rss.js b/app/assets/stylesheets/rss.js deleted file mode 100644 index 36309900..00000000 --- a/app/assets/stylesheets/rss.js +++ /dev/null @@ -1,513 +0,0 @@ -//Created by Harry Bomrah on Sep 21 2011 -$rss = jQuery.noConflict(); -var rcom={ -//Pass dom and will return binded dom with starting year till current -insertDatePanel : function(dom,year){ - if(!year)year=1901; - if(dom=="")return false; - domid=dom.attr("id"); - var dt = new Date(); - current_year=dt.getFullYear(); - var dthtml="Year: Date: Month: "; - dom.html(dthtml); -}, - -//loading overlay around a dom... -loadingWrapper : function(dom, display){ - if(display){ - dom.prepend("
"); - $rss("#loading_wrapper").height(dom.height()); - $rss("#loading_wrapper").width(dom.width()); - }else{ - domId=dom.attr("id"); - $rss("#"+domId+" #loading_wrapper").remove(); - } - }, - -//validating a dom.... -validate : function(dom, validation, errormsg){ - var domValue = dom.val(); - var error = false; - var regex=""; - var msg = ""; - switch(validation){ - case "required": - if(domValue=="")error=true; - msg="Cannot be empty."; - break; - case "email": - regex=/^([\w-\.]+@([\w-]+\.)+[\w-]{2,4})?$/; - msg="Invalid Email Address."; - break; - case "number": - regex=/^\d*[0-9](|.\d*[0-9]|,\d*[0-9])?$/; - msg = "Only numbers are accepted."; - break; - case "alphanumeric": - regex=/^\s*[a-zA-Z0-9,\s]+\s*$/; - msg="Only numbers, alphabets and spaces are allowed."; - break; - } - domId=dom.attr("name"); - if(errormsg=="")errormsg=msg; - if(regex!="")if(!regex.test(domValue))error=true; - if(error){$rss("#"+domId+"_error").remove();dom.after(""+errormsg+"");return false;} else{ $rss("#"+domId+"_error").remove();return true;} - }, - -bindToSpinner : function(dom,data,callbackFn){ - var domId = dom.attr("id"); - var dhtml=""; - var spinnerValue=Array(); - var spinnerDisplay=Array(); - $rss.each(data,function(i,it){ - $rss.each(data[i],function(key,it){ - spinnerValue.push(it); - }); - }); - dhtml=""; - dom.html(dhtml); - if(typeof callbackFn=="function") - callbackFn.call(this, dhtml); - }, - - //binds the recieved json to a table -bindToTable : function(dom,data,headers,actions,css_class,callbackFn){ - if(!css_class)css_class=""; - var dhtml=""; - var domId = dom.attr("id"); - if(actions){ - var btnTitles=Array(); - var btnFunctions=Array(); - $rss.each(actions,function(title,func){ - btnTitles.push(title); - btnFunctions.push(func); - }); - rcom.translate(btnTitles,function(convertedData){ - btnTitles=convertedData.slice(); - - rcom.translate(headers,function(convertedData){ - headers=convertedData; - if(!data)return; - $rss.each(headers,function(i,head){ - dhtml+=""; - }); - dhtml+=""; - if(data.length==0)dhtml+=""; - $rss.each(data,function(i,item){ - var cl=""; - if(i%2!=0)cl="even"; - dhtml+=""; - $rss.each(item,function(i,it){ - if(i!="id"){ - if(it==null)it="Not Set"; - dhtml+=""; - } - }) - dhtml+=""; - dhtml+=""; - }); - dhtml+="
"+head+"
No Data
"+it+""; - for(x=0;x"+btnTitles[x]+""; - } - dhtml+="
"; - dom.html(dhtml); - }); - }); - }else{ - rcom.translate(headers,function(convertedData){ - headers=convertedData; - if(!data)return; - if(headers.length>0){ - $rss.each(headers,function(i,head){ - dhtml+=""+head+""; - }); - } - dhtml+=""; - if(data.length==0)dhtml+="No Data"; - - $rss.each(data,function(i,item){ - var cl=""; - if(i%2!=0)cl="even"; - dhtml+=""; - $rss.each(item,function(i,it){ - if(i!="id"){ - if(it==null)it="Not Set"; - dhtml+=""+it+""; - } - }) - dhtml+=""; - }); - dhtml+=""; - dom.html(dhtml); - }); - } - - if(typeof callbackFn=="function") - callbackFn.call(this, dhtml); -}, - //convert to date string which can be directly inserted in database or according to any format. -convertToInsertableDate : function(y,m,d,format){ - var dt=""; - if(m<10)m="0"+m; - if(d<10)d="0"+d; - switch(format){ - case "yyyy-mm-dd": - dt= y+"-"+m+"-"+d; - break; - case "dd-mm-yyyy": - dt= d+"-"+m+"-"+y; - break; - case "mm-dd-yyyy": - dt= m+"-"+d+"-"+y; - break; - default: - dt= y+"-"+m+"-"+d; - break; - } - return dt; - }, -//a fucntion to show specific divs and hide all other -showDoms : function(doms){ - $rss("body").find("div").each(function(){$rss(this).hide();}); - $rss.each(doms,function(i,dom){ - dom.show(); - }); - }, - -//a function to translate the word or array.. -translate : function(data,callbackFn){ - var cdata=""; - var status =true; - if(!data){ - if(typeof callbackFn=="function") - callbackFn.call(this,cdata); - status=false; - } - if(data==""){ - if(typeof callbackFn=="function") - callbackFn.call(this,cdata); - status=false; - } - if(status){ - $rss.getJSON("../../classes/translate.php", {fn:"translateThis",tData:data},function(convertedData){ - if(typeof callbackFn=="function") - callbackFn.call(this, convertedData); - }); - } - }, - -// a function to bind JSON to list -bindToList : function(dom,data,callbackFn){ - var domId = dom.attr("id"); - var dhtml=""; - var listValue=Array(); - var listDisplay=Array(); - $rss.each(data,function(i,it){ - $rss.each(data[i],function(key,it){ - listValue.push(it); - }); - }); - dhtml=""; - dom.html(dhtml); - if(typeof callbackFn=="function") - callbackFn.call(this,dhtml); - }, -makeDraggable : function(handler,dom){ - handler.css("position","absolute"); - dom.css("position","absolute"); - var puranix=0; - var nayeex=0; - var puraniy=0; - var nayeey=0; - var offset=""; - var zIndex=dom.css("z-index"); - handler.mousedown(function(e){ - puranix=e.clientX; - puraniy=e.clientY; - offset=dom.offset(); - $rss(this).mousemove(function(e){ - nayeex=e.clientX-puranix; - nayeex+=offset.left; - nayeey=e.clientY-puraniy; - nayeey+=offset.top; - dom.css({"left":nayeex+"px","top":nayeey+"px","z-index":"9999"}); - }) - }).mouseup(function(){ - $rss(this).unbind("mousemove"); - dom.css("z-index",zIndex); - }) - }, - -//automatically scrolls to the bottom of the div -scrollToBottom : function(dom){ - var domId = dom.attr("id"); -// var domScrollHeight = document.getElementById(domId).scrollHeight; - var obj = document.getElementById(domId); - - if((obj.scrollTop+100) >= (obj.scrollHeight - obj.offsetHeight)) - dom.scrollTop(obj.scrollHeight); - }, - -/*ajax loading of images... needs following settings -dom:in which images ve to be loaded -url:the server url for making ajax calls -limit:how many images to load -divClass:the class of div surrounding each image -nameClass:class for span showing name -fn:function to be called in on the server -imageSrc:the image source of all the images. -bindTo:to bind images to a onclick function or else will be binded to normal a tag. -urlKey:to specify the key of the value.. if bindTo is used, this will be neglected.. -returns json; -*/ -loadImages : function(settings,callbackFn){ - - var dom = settings.dom; - var domid= dom.attr("id"); - var temp_array=Array(); - var starting = $rss("#"+domid+" img:last").attr("id"); - if(typeof starting != 'undefined'){ - starting = starting.substr(4,starting.length-1); - }else{starting = 0}; - var temp_var=""; - var json = ""; - var dhtml=""; - var extraparam=""; - if(typeof settings.extraParam != "undefined"){ - extraparam = settings.extraParam; - } - $rss.getJSON(settings.url,{fn:settings.fn,id:settings.whereId,limit:settings.limit,start:starting,extra:extraparam},function(images){ - json = eval(images); - $rss.each(images,function(i,pic){ - var temp_array=Array(); - var a_var=Array(); - var name_var=""; - var title=""; - $rss.each(pic,function(i,value){ - temp_array.push(value); - }) - if(temp_array.length>=4){ - name_var=""+temp_array[3]+"
" - } - if(temp_array[2]==null) - title = ""; - else - title = temp_array[2]; - if(typeof settings.bindTo!="undefined"){ - a_var[1]="onclick='"+settings.bindTo+"("+temp_array[0]+");return false;'"; - a_var[0]=""; - }else{a_var[0]='?'+settings.urlKey+'='+temp_array[0];a_var[1]="";} - dhtml="
"+name_var; - dom.delay(100).append(dhtml); - $rss("#pic_"+pic.id).delay(100).fadeIn(200); - - }) - if(typeof callbackFn=="function") - callbackFn.call(this,json); - }) - - - }, - -//function to get url variables... -getUrlVars : function(){ - var vars = [], hash; - var hashes = window.location.href.slice(window.location.href.indexOf('?') + 1).split('&'); - for(var i = 0; i < hashes.length; i++){ - hash = hashes[i].split('='); - vars.push(hash[0]); - vars[hash[0]] = hash[1]; - } - return vars; -}, -/*function to open a modalwindow on a page.. self reliant no images, no css needed. -settings - -width:in percentage or pixcel -height:in percentage or pixcel -closeBtn:true or false -envClose:closing through background click, true or flase -loadDiv:load html from a div -loadPage:load a page -loadHtml: load html - -*/ -modalWindow : function(settings,callbackFn){ - - var envClose = settings.envClose; - var dhtml=""; - if(typeof envClose == "undefined") - envClose = true; - var closeBtn = settings.closeBtn; - if(typeof closeBtn == "undefined") - closeBtn = true; - - var rgmaskHeight = $rss(window).height(); - var rgmaskWidth = $rss(window).width(); - var tempheight = settings.height; - var tempwidth = settings.width; - - if(typeof tempheight!="undefined"){ - if(tempheight.charAt(tempheight.length-1)=='%') - tempheight=(rgmaskHeight*parseInt(tempheight.substr(0,tempheight.length)))/100; - }else{tempheight="auto";} - - if(typeof tempwidth!="undefined"){ - if(tempwidth.charAt(tempwidth.length-1)=='%') - tempwidth=(rgmaskWidth*parseInt(tempwidth.substr(0,tempwidth.length)))/100; - }else{tempwidth="auto";} - - $rss("body").append('
'); - $rss("#rgsheath").css({background: "#000", width: "100%", position: "fixed", top: 0, left: 0,opacity:0.9,'z-index':199}); - $rss("body").append('
'); - $rss("#rgWindow").css({"position": "fixed", "z-index": "999", "background": "#fff", "border": "solid 3px #ccc", "padding": "20px", "overflow": "hidden", "border-radius": "12px", "-webkit-border-radius": "12px", "-moz-border-radius": "12px", "-ms-border-radius": "12px", "box-shadow": "0 0 20px rgba(0,0,0,0.9)","-webkit-box-shadow": "0 0 20px rgba(0,0,0,0.9)","-moz-box-shadow": "0 0 20px rgba(0,0,0,0.9)","-ms-box-shadow": "0 0 20px rgba(0,0,0,0.9)"}); - var rgWTop = (rgmaskHeight-20)/2; - var rgWLeft = (rgmaskWidth-20)/2; - $rss("#rgWindow").css({top:rgWTop+"px", left:rgWLeft+"px"}); - if(typeof settings.loadDiv!="undefined"){ - dhtml = $rss("#"+settings.loadDiv).html(); - $rss("#rgWindow").html(dhtml).hide(); - prepareWindow(); - } - if(typeof settings.loadHtml!="undefined"){ - dhtml = settings.loadHtml; - $rss("#rgWindow").html(dhtml).hide(); - prepareWindow(); - } - if(typeof settings.loadPage!="undefined"){ - $rss("#rgWindow").load(settings.loadPage,function(){$rss(this).hide();dhtml=$rss(this).html();prepareWindow();}); - } - function prepareWindow(){ - if(tempheight!="auto") - rgWTop = (rgmaskHeight-tempheight)/2; - else{ - tempheight=$rss("#rgWindow").height(); - rgWTop=(rgmaskHeight-tempheight)/2; - } - if(tempwidth!="auto") - rgWLeft = (rgmaskWidth-tempwidth)/2; - else{ - tempwidth=$rss("#rgWindow").width(); - rgWLeft=(rgmaskWidth-tempwidth)/2; - } - $rss("#rgWindow").empty().show(); - var closebtn = ""; - if(closeBtn) - closebtn='X'; - $rss("#rgWindow").animate({"width":tempwidth+"px","height":tempheight+"px",top:rgWTop+"px", left:rgWLeft+"px"},500,function(){$rss("#rgWindow").html(closebtn+"
"+dhtml+"
"); - $rss("#close_modal").mouseover(function(){$rss(this).css("color","#999");}).mouseout(function(){$rss(this).css("color","#666");}) - $rss("#close_modal").click(function(){ - $rss("#rgWindow").empty(); - var x = (rgmaskHeight-20)/2; - var y = (rgmaskWidth-20)/2; - $rss("#rgWindow").animate({top:x+"px", left:y+"px","width":"50px","height":"50px"},300,function(){$rss(this).fadeOut(100).remove();$rss("#rgsheath").fadeOut(500).remove();}); - return false; - }) - if(envClose) - $rss("#rgsheath").click(function(){ - $rss("#rgWindow").empty(); - var x = (rgmaskHeight-20)/2; - var y = (rgmaskWidth-20)/2; - $rss("#rgWindow").animate({top:x+"px", left:y+"px","width":"50px","height":"50px"},300,function(){$rss(this).fadeOut(100).remove();$rss("#rgsheath").fadeOut(500).remove();});}) - - if(typeof callbackFn=="function") - callbackFn.call(this,dhtml); - }); - } -}, -modalWindowClose : function(callbackFn){ - if($rss("#rgWindow").length>0){ - $rss("#rgWindow").empty(); - var rgmaskHeight = $rss(window).height(); - var rgmaskWidth = $rss(window).width(); - var x = (rgmaskHeight-20)/2; - var y = (rgmaskWidth-20)/2 - $rss("#rgWindow").animate({top:x+"px", left:y+"px","width":"50px","height":"50px"},300,function(){$rss(this).fadeOut(100).remove();$rss("#rgsheath").fadeOut(500).remove();}) - } - if(typeof callbackFn=="function") - callbackFn.call(this,"harry"); -}, -bindDomToHead : function(dom){ - var gc = dom.css("background"); - var t = dom.offset(); - var gw = dom.width(); - $rss(window).scroll(function(){ - var wt = $rss(window).scrollTop(); - if ( wt > t.top ) { - var cssObj = { - 'position':'fixed', - 'top':0, - 'width':gw, - 'background':gc, - 'box-shadow':'0 1px 0 rgba(0,0,0,0.2)', - 'z-index':99 - } - dom.css(cssObj); - } else { - dom.attr('style',""); - } - }); -}, -progressBar : function(dom,settings){ - var domid = dom.prop("id"); - if($rss("#rss_progressbar_div_"+domid).length==0){ - if(typeof settings.top == "undefined") - settings.value = 1; - if(typeof settings.top == "undefined") - settings.top = (dom.height()-12)/2; - dom.append(""); - $rss("#rss_progressbar_div_"+domid).fadeIn(500); - } -}, -progressBarValue : function(dom,value){ - var domid = dom.prop("id"); - if($rss("#rss_progressbar_div_"+domid).length==1){ - $rss("#rss_progressbar_"+domid).animate({"width":value+"%"},100); - - } -}, -progressBarClose : function(dom){ - var domid = dom.prop("id"); - $rss("#rss_progressbar_div_"+domid).fadeOut(500,function(){$(this).remove();}); -}, -getInternetExplorerVersion: function(){ - var rv = -1; // Return value assumes failure. - if (navigator.appName == 'Microsoft Internet Explorer') - { - var ua = navigator.userAgent; - var re = new RegExp("MSIE ([0-9]{1,}[\.0-9]{0,})"); - if (re.exec(ua) != null) - rv = parseFloat( RegExp.$1 ); - } - return rv; - } -} -$ = jQuery.noConflict(); \ No newline at end of file diff --git a/app/assets/stylesheets/style.css.erb b/app/assets/stylesheets/style.css.erb index 5a7253c5..70279d81 100644 --- a/app/assets/stylesheets/style.css.erb +++ b/app/assets/stylesheets/style.css.erb @@ -1,28 +1,48 @@ @font-face{ font-family: 'WebSymbolsRegular'; - src: url(<%= asset_path "websymbols-regular-webfont.eot" %>); - src: url(<%= asset_path "websymbols-regular-webfont.eot?#iefix" %>) format('embedded-opentype'), - url(<%= asset_path "websymbols-regular-webfont.woff" %>) format('woff'), - url(<%= asset_path "websymbols-regular-webfont.ttf" %>) format('truetype'), - url(<%= asset_path "websymbols-regular-webfont.svg#WebSymbolsRegular" %>) format('svg'); + src: url(<%= asset_path 'websymbols-regular-webfont.eot' %>); + src: url(<%= asset_path 'websymbols-regular-webfont.eot?#iefix' %>) format('embedded-opentype'), + url(<%= asset_path 'websymbols-regular-webfont.woff' %>) format('woff'), + url(<%= asset_path 'websymbols-regular-webfont.ttf' %>) format('truetype'), + url(<%= asset_path 'websymbols-regular-webfont.svg#WebSymbolsRegular' %>) format('svg'); +} +.login-logo { + text-indent: -9999px; + background: url(<%= asset_path 'sign-in-logo.png' %>) no-repeat center 40px; + padding-top: 40px; + height: 160px; } - #orbit-bar { margin-bottom: 0; position:fixed; width:100%; z-index: 99; + top: 0; + left: 0; } #orbit-bar .navbar-inner { + height: 40px; -moz-border-radius: 0px; -webkit-border-radius: 0px; border-radius: 0px; + padding-top: 2px; + padding-bottom: 1px; + -webkit-box-shadow: 0 1px 3px rgba(0, 0, 0, 0.8), inset 0 1px 0 rgba(127, 149, 165, 1), 0 -1px 0 rgba(31, 32, 36, 1) inset; + -moz-box-shadow: 0 1px 3px rgba(0, 0, 0, 0.8), inset 0 1px 0 rgba(127, 149, 165, 1), 0 -1px 0 rgba(31, 32, 36, 1) inset; + box-shadow: 0 1px 3px rgba(0, 0, 0, 0.8), inset 0 1px 0 rgba(127, 149, 165, 1), 0 -1px 0 rgba(31, 32, 36, 1) inset; + background-image: -moz-linear-gradient(top, #545b60, #191a1c); + background-image: -ms-linear-gradient(top, #545b60, #191a1c); + background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#545b60), to(#191a1c)); + background-image: -webkit-linear-gradient(top, #545b60, #191a1c); + background-image: -o-linear-gradient(top, #545b60, #191a1c); + background-image: linear-gradient(top, #545b60, #191a1c); + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#545b60', endColorstr='#191a1c', GradientType=0); } #orbit-bar .container { width:100%; } #orbit-bar .orbit-logo .brand { - background: url(<%= asset_path "orbit-bar.png" %>) no-repeat -162px top; + background: url(<%= 'orbit-bar.png' %>) no-repeat -162px top; text-indent:-9999px; } #orbit-bar .orbit-logo .brand:hover { @@ -38,7 +58,7 @@ background-color: rgba(0,157,220,1); } #orbit-bar .nav > li > a { - background-image: url(<%= asset_path "orbit-bar.png" %>); + background-image: url(<%= 'orbit-bar.png' %>); background-repeat:no-repeat; display: inline-block; width: 16px; @@ -56,41 +76,216 @@ background-position: -38px -4px; margin: 0 10px 0 0; } +#orbit-bar .nav > li > a.orbit-bar-member { + background-position: -4px -37px; +} #orbit-bar .nav > li > a.orbit-bar-search { background-position: -68px -4px; } -#orbit-bar .log { - margin: 0 10px 0 0; +#orbit-bar .bar-login { + } -#orbit-bar .log input { - margin: 5px 0 0; +#orbit-bar .bar-login .open { + background-color: #009DDC; +} +#orbit-bar .bar-login .dropdown-menu { + padding: 0 0 10px; + max-width: 260px; +} +#orbit-bar .bar-login .dropdown-menu .log { + margin: 10px 15px 0; + list-style: none outside none; +} +#orbit-bar .bar-login .dropdown-menu .log .title { + background: url(<%= 'sign-in-logo2.png' %>) no-repeat center center; + height: 70px; +} +#orbit-bar .bar-login .dropdown-menu .log form { + margin: 0 0 8px; +} +#orbit-bar .bar-login .dropdown-menu .log input { + display: inline-block; + margin: 0; +} +#orbit-bar .bar-login .dropdown-menu .log .span2 { + width: 183px; +} +#orbit-bar .bar-login .dropdown-menu .log .forgot { + margin-bottom: 20px; + padding: 3px 0 0; + float: right; + display: inline-block; + color: #0088CC; +} +#orbit-bar .bar-login .dropdown-menu .log .input-prepend { + margin-top: 20px; +} +#orbit-bar .bar-login .dropdown-menu .log .remember { + margin-top: 5px; +} +#orbit-bar .bar-login .dropdown-menu .log .forgot:hover { + padding: 3px 0 0; + float: right; + display: inline-block; + color: #005580; + text-decoration: underline; + background-color: transparent; +} +#orbit-bar .bar-login .dropdown-menu .log .btn { + width: 220px; +} +#orbit-bar .bar-login .dropdown-menu .log .divider { + position:relative; + overflow: inherit; + margin: 20px 0; +} +#orbit-bar .bar-login .dropdown-menu .log .divider span { + position: absolute; + width: 20px; + height: 20px; + background-color: #FFF; + color: #666; + top: -9px; + left: 100px; + font-size:16px; + text-align: center; +} +#signin-body{ + background: url(<%= 'background.jpg' %>) repeat left top; } - #main-sidebar { - background-color: #FFFFFF; + background: url(<%= 'background.jpg' %>) repeat left top; width: 155px; padding-right: 4px; - border-right: 1px solid rgba(0,0,0,.3); + border-right: 1px solid rgba(0,0,0,.2); position:fixed; - top:40px; + top: 42px; z-index: 88; } - +#main-sidebar .nav { + padding-top: 5px; +} +#main-sidebar .nav > li.active > a [class^="icons-"] { + background-image: url(<%= 'icons_pack_white.png' %>); +} +#main-sidebar .nav > li > .nav { + margin-left: -14px; + margin-bottom: 5px; + width: 155px; + padding: 0; + background-color: #FFF; + /*border-radius: 0px 0px 8px 0px; + -webkit-border-radius: 0px 0px 8px 0px; + -moz-border-radius: 0px 0px 8px 0px;*/ + box-shadow: 0px 2px 1px rgba(0,0,0,0.1); + -moz-box-shadow: 0px 2px 1px rgba(0,0,0,0.1); + -webkit-box-shadow: 0px 2px 1px rgba(0,0,0,0.1); +} +#main-sidebar .nav > li > .nav > li > a { + margin-left: 0; + padding-left: 19px; + color: #999; +} +#main-sidebar .nav > li > .nav > li > a:hover { + color: #000; + background-color: #d7eeff; +} +#main-sidebar .nav > li > .nav > li.active > a { + background-color: #b7b7b7; + color: #fff; +} #main-wrap { + background-color: #FFF; margin-left:160px; - padding-top: 40px; + padding-top: 42px; + padding-bottom: 18px; position: relative; } #main-wrap > .form-actions { + background-color: #FFF; text-align: center; - padding: 17px 20px 27px; + padding: 17px 20px 0; margin: 0; } - #main-wrap .subnav { height: auto; min-height: 36px; } +#main-wrap .pagination { + margin: 18px 0 0; + text-align: center; +} +#main-wrap .breadcrumb { + border-radius: 0; + -moz-border-radius: 0; + -webkit-border-radius: 0; + border-width: 0 0 1px 0; + box-shadow: none; + -webkit-box-shadow: none; + -moz-box-shadow: none; + margin-bottom: 0px; +} +#main-wrap .breadcrumb li { + font-size: 12px; + color: #999; +} +#sub-wiget { + clear: right; + float: right; + padding-right: 10px; + padding-top: 8px; + position: relative; + margin-bottom: 13px; + width: 304px; +} +.main-wiget .widget-box { + margin: 5px 0; + width: 100%; +} +#poststuff .form-actions { + background-color: transparent; + text-align: right; + padding-left: 10px; + padding-right: 10px; + margin-bottom: 0; + clear: both; +} +#poststuff form { + margin-bottom: 0; +} +#post-body { + float: left; + clear: left; + width: 100%; + margin-right: -340px; +} +#post-body .title input[type=text] { + margin-bottom: 0; + width: 100%; + height: 30px; +} +#post-body .btn-group { + margin-left: 5px; +} +#post-body .well { + margin: 0; + border-radius: 0px; + -moz-border-radius: 0px; + box-shadow: none; + -moz-box-shadow: none; + -webkit-box-shadow: none; + border-top: none; +} +#post-body .editor { + background-color: #333333; + height: 20px; + margin: 8px 0; + width: 100%; +} +#post-body-content { + margin-right: 320px; + padding: 8px 0 8px 6px; +} .filter .accordion-heading > a:hover { text-decoration: none; } @@ -117,23 +312,14 @@ border-top-color: #0088CC; margin-top: 6px; } -.accordion-group .web-symbol:after { - font-family: 'WebSymbolsRegular'; - content: "{"; - margin-left: 2px; - margin-top: 8px; -} .filter .active { background-color: #0088CC; } .filter .active a { color: #FFF; } -.filter .active .web-symbol:after { - content: "}"; -} .filters { - background-color: rgba(0,0,0,0.025); + background-color: rgba(0,0,0,0.075); -webkit-box-shadow: inset 0 2px 3px rgba(0, 0, 0, 0.2); -moz-box-shadow: inset 0 2px 3px rgba(0, 0, 0, 0.2); box-shadow: inset 0 2px 3px rgba(0, 0, 0, 0.2); @@ -148,12 +334,107 @@ .filters .filter-clear { padding: 5px 5px 0; border-top: 1px solid rgba(0,0,0,0.1); - background-color: rgba(0,0,0,0.025); text-align: right; + margin: 0 5px; + -webkit-box-shadow: inset 0 1px 0px rgba(255, 255, 255, 0.5); + -moz-box-shadow: inset 0 1px 0px rgba(255, 255, 255, 0.5); + box-shadow: inset 0 1px 0px rgba(255, 255, 255, 0.5); } .filters .in { border-bottom: 1px solid rgba(0,0,0,0.07) } +.sign-in { + width: 360px; + margin: 0 auto 70px; + background-color: #FFF; + -moz-border-radius: 0 0 5px 5px; + -webkit-border-radius: 0 0 5px 5px; + border-radius: 0 0 5px 5px; + -moz-box-shadow: 0 2px 2px rgba(143, 143, 143, 0.38); + -webkit-box-shadow: 0 2px 2px rgba(143, 143, 143, 0.38); + box-shadow: 0 2px 2px rgba(143, 143, 143, 0.38); + border-width: 0px 1px 1px 1px; + border-style: none solid solid solid; + border-color: transparent #c6c6c6 #c6c6c6 #c6c6c6; +} +#signin-header { + width: 340px; + margin: 30px auto 0; + line-height: 25px; + padding: 5px 10px; + border-width: 1px 1px 0px 1px; + border-style: solid solid none solid; + border-color: #c6c6c6 #c6c6c6 transparent #c6c6c6; + background-color: #006dcc; + background-image: -moz-linear-gradient(top, #dadada, #c0c0c0); + background-image: -ms-linear-gradient(top, #dadada, #c0c0c0); + background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#dadada), to(#c0c0c0)); + background-image: -webkit-linear-gradient(top, #dadada, #c0c0c0); + background-image: -o-linear-gradient(top, #dadada, #c0c0c0); + background-image: linear-gradient(top, #dadada, #c0c0c0); + -moz-border-radius: 5px 5px 0px 0px ; + -webkit-border-radius: 5px 5px 0px 0px; + border-radius: 5px 5px 0px 0px; + -moz-box-shadow: 0 1px 0px rgba(20, 20, 20, 0.3); + -webkit-box-shadow: 0 1px 0px rgba(20, 20, 20, 0.3); + box-shadow: 0 1px 0px rgba(20, 20, 20, 0.3); +} +#signin-header h3 { + color: #848484; + text-shadow: 0 1px 0 #e9e9e9; +} +#sign-footer { + width: 100%; + position:fixed; + bottom: 0; + height: 40px; + background-color: #dadada; + color: #7a7a7a; + box-shadow: 0 -1px 3px rgba(0, 0, 0, 0.3); + -moz-box-shadow: 0 -1px 3px rgba(0, 0, 0, 0.3); + -webkit-box-shadow: 0 -1px 3px rgba(0, 0, 0, 0.3); +} +#sign-footer p { + line-height: 40px; + padding: 0 10px; + text-align: right; +} +.sign-in .control-group label { + text-align: left; + width: auto; + font-size: 15px; +} +.sign-in .forgot { + padding-top: 5px; +} +.sign-in .content { + padding: 10px; +} +.sign-in .form-actions { + padding: 17px 10px 18px; + margin: 0; + -moz-border-radius: 0px 0px 5px 5px; + -webkit-border-radius: 0px 0px 5px 5px; + border-radius: 0px 0px 5px 5px; +} +.sign-in form { + margin: 0; +} +.sign-in .control-group .help-inline { + display:none; +} +.sign-in .error .help-inline { + display:inline-block; +} +.web-symbol:after { + font-family: 'WebSymbolsRegular'; + content: "{"; + margin-left: 2px; + margin-top: 8px; +} +.active .web-symbol:after { + content: "}"; +} /*icons*/ .the-icons i:after { content: attr(class); @@ -166,12 +447,36 @@ display: block; margin-bottom: 5px; } +[class^="text-"] { + font-size: 15px !important; +} +.text-blue { + color: #0088CC !important; +} +.text-red { + color: #CC3300 !important; +} +.text-yellow { + color: #ffcc00 !important; +} +.text-orange { + color: #f7941d !important; +} +.text-purple { + color: #a864a8 !important; +} +.text-palm { + color: #a67c52 !important; +} +.text-green { + color: #39b54a !important; +} [class^="icons-"] { display: inline-block; width: 16px; height: 16px; vertical-align: text-top; - background-image: url(<%= asset_path "icons_pack.png" %>); + background-image: url(<%= 'icons_pack.png' %>); background-position: 16px 16px; background-repeat: no-repeat; *margin-right: .3em; @@ -181,7 +486,7 @@ *margin-left: 0; } .icons-white { - background-image: url(<%= asset_path "icons_pack_white.png" %>); + background-image: url(<%= 'icons_pack_white.png' %>); } /*1*/ .icons-pencil { diff --git a/app/assets/stylesheets/widget.css b/app/assets/stylesheets/widget.css index 7dcc7fd3..b66a6074 100644 --- a/app/assets/stylesheets/widget.css +++ b/app/assets/stylesheets/widget.css @@ -5,26 +5,34 @@ background-color: #FFF; overflow: hidden; min-width: 300px; - border: 1px solid #DDD; - border-radius: 5px; - -moz-border-radius: 5px; - -webkit-border-radius: 5px; margin: 0 0 5px 5px; position:relative; } .widget-box .widget-title { - background: #999; color: #FFF; padding-left: 5px; border-radius: 5px 5px 0 0; -moz-border-radius: 5px 5px 0 0; -webkit-border-radius: 5px 5px 0 0; + background-image: -moz-linear-gradient(top, #B7B7B7, #9d9d9d); + background-image: -ms-linear-gradient(top, #B7B7B7, #9d9d9d); + background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#B7B7B7), to(#9d9d9d)); + background-image: -webkit-linear-gradient(top, #B7B7B7, #9d9d9d); + background-image: -o-linear-gradient(top, #B7B7B7, #9d9d9d); + background-image: linear-gradient(top, #B7B7B7, #9d9d9d); + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#B7B7B7', endColorstr='#9d9d9d', GradientType=0); } .widget-box .widget-title [class^="icons-"] { margin: 3px 5px 0 2px; } .widget-box .widget-content { padding: 10px; + border-width: 0 1px 1px; + border-style: solid; + border-color: #CCCCCC; + border-radius: 0 0 5px 5px; + -moz-border-radius: 0 0 5px 5px; + -webkit-border-radius: 0 0 5px 5px; } .widget-box .form-horizontal .control-group > label { width: 50px; diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb index f48777cc..4b433777 100644 --- a/app/controllers/application_controller.rb +++ b/app/controllers/application_controller.rb @@ -3,6 +3,8 @@ class ApplicationController < ActionController::Base include ParserFrontEnd, ParserBackEnd + layout :layout_by_resource + helper :all before_filter :set_locale, :set_site @@ -104,6 +106,12 @@ class ApplicationController < ActionController::Base Item.first(:conditions => {:parent_id => nil}) end - + def layout_by_resource + if devise_controller? + "devise" + else + "application" + end + end end diff --git a/app/views/devise/confirmations/new.html.erb b/app/views/devise/confirmations/new.html.erb new file mode 100644 index 00000000..b7ae403c --- /dev/null +++ b/app/views/devise/confirmations/new.html.erb @@ -0,0 +1,12 @@ +

Resend confirmation instructions

+ +<%= form_for(resource, :as => resource_name, :url => confirmation_path(resource_name), :html => { :method => :post }) do |f| %> + <%= devise_error_messages! %> + +
<%= f.label :email %>
+ <%= f.email_field :email %>
+ +
<%= f.submit "Resend confirmation instructions" %>
+<% end %> + +<%= render :partial => "devise/shared/links" %> \ No newline at end of file diff --git a/app/views/devise/mailer/confirmation_instructions.html.erb b/app/views/devise/mailer/confirmation_instructions.html.erb new file mode 100644 index 00000000..a6ea8ca1 --- /dev/null +++ b/app/views/devise/mailer/confirmation_instructions.html.erb @@ -0,0 +1,5 @@ +

Welcome <%= @resource.email %>!

+ +

You can confirm your account through the link below:

+ +

<%= link_to 'Confirm my account', confirmation_url(@resource, :confirmation_token => @resource.confirmation_token) %>

diff --git a/app/views/devise/mailer/reset_password_instructions.html.erb b/app/views/devise/mailer/reset_password_instructions.html.erb new file mode 100644 index 00000000..ae9e888a --- /dev/null +++ b/app/views/devise/mailer/reset_password_instructions.html.erb @@ -0,0 +1,8 @@ +

Hello <%= @resource.email %>!

+ +

Someone has requested a link to change your password, and you can do this through the link below.

+ +

<%= link_to 'Change my password', edit_password_url(@resource, :reset_password_token => @resource.reset_password_token) %>

+ +

If you didn't request this, please ignore this email.

+

Your password won't change until you access the link above and create a new one.

diff --git a/app/views/devise/mailer/unlock_instructions.html.erb b/app/views/devise/mailer/unlock_instructions.html.erb new file mode 100644 index 00000000..2263c219 --- /dev/null +++ b/app/views/devise/mailer/unlock_instructions.html.erb @@ -0,0 +1,7 @@ +

Hello <%= @resource.email %>!

+ +

Your account has been locked due to an excessive amount of unsuccessful sign in attempts.

+ +

Click the link below to unlock your account:

+ +

<%= link_to 'Unlock my account', unlock_url(@resource, :unlock_token => @resource.unlock_token) %>

diff --git a/app/views/devise/passwords/edit.html.erb b/app/views/devise/passwords/edit.html.erb new file mode 100644 index 00000000..e75c9371 --- /dev/null +++ b/app/views/devise/passwords/edit.html.erb @@ -0,0 +1,16 @@ +

Change your password

+ +<%= form_for(resource, :as => resource_name, :url => password_path(resource_name), :html => { :method => :put }) do |f| %> + <%= devise_error_messages! %> + <%= f.hidden_field :reset_password_token %> + +
<%= f.label :password, "New password" %>
+ <%= f.password_field :password %>
+ +
<%= f.label :password_confirmation, "Confirm new password" %>
+ <%= f.password_field :password_confirmation %>
+ +
<%= f.submit "Change my password" %>
+<% end %> + +<%= render :partial => "devise/shared/links" %> \ No newline at end of file diff --git a/app/views/devise/passwords/new.html.erb b/app/views/devise/passwords/new.html.erb new file mode 100644 index 00000000..dd31973b --- /dev/null +++ b/app/views/devise/passwords/new.html.erb @@ -0,0 +1,21 @@ +

<%= t(:ruling_site) %>

+
+

<%= t(:forgot_password) %>

+
+ \ No newline at end of file diff --git a/app/views/devise/registrations/edit.html.erb b/app/views/devise/registrations/edit.html.erb new file mode 100644 index 00000000..ff380509 --- /dev/null +++ b/app/views/devise/registrations/edit.html.erb @@ -0,0 +1,25 @@ +

Edit <%= resource_name.to_s.humanize %>

+ +<%= form_for(resource, :as => resource_name, :url => registration_path(resource_name), :html => { :method => :put }) do |f| %> + <%= devise_error_messages! %> + +
<%= f.label :email %>
+ <%= f.email_field :email %>
+ +
<%= f.label :password %> (leave blank if you don't want to change it)
+ <%= f.password_field :password %>
+ +
<%= f.label :password_confirmation %>
+ <%= f.password_field :password_confirmation %>
+ +
<%= f.label :current_password %> (we need your current password to confirm your changes)
+ <%= f.password_field :current_password %>
+ +
<%= f.submit "Update" %>
+<% end %> + +

Cancel my account

+ +

Unhappy? <%= link_to "Cancel my account", registration_path(resource_name), :confirm => "Are you sure?", :method => :delete %>.

+ +<%= link_to "Back", :back %> diff --git a/app/views/devise/registrations/new.html.erb b/app/views/devise/registrations/new.html.erb new file mode 100644 index 00000000..d15e275a --- /dev/null +++ b/app/views/devise/registrations/new.html.erb @@ -0,0 +1,18 @@ +

Sign up

+ +<%= form_for(resource, :as => resource_name, :url => registration_path(resource_name)) do |f| %> + <%= devise_error_messages! %> + +
<%= f.label :email %>
+ <%= f.email_field :email %>
+ +
<%= f.label :password %>
+ <%= f.password_field :password %>
+ +
<%= f.label :password_confirmation %>
+ <%= f.password_field :password_confirmation %>
+ +
<%= f.submit "Sign up" %>
+<% end %> + +<%= render :partial => "devise/shared/links" %> diff --git a/app/views/devise/sessions/new.html.erb b/app/views/devise/sessions/new.html.erb new file mode 100644 index 00000000..738e2645 --- /dev/null +++ b/app/views/devise/sessions/new.html.erb @@ -0,0 +1,34 @@ +

<%= t(:ruling_site) %>

+
+

<%= t(:login) %>

+
+ \ No newline at end of file diff --git a/app/views/devise/shared/_links.erb b/app/views/devise/shared/_links.erb new file mode 100644 index 00000000..eab783a4 --- /dev/null +++ b/app/views/devise/shared/_links.erb @@ -0,0 +1,25 @@ +<%- if controller_name != 'sessions' %> + <%= link_to "Sign in", new_session_path(resource_name) %>
+<% end -%> + +<%- if devise_mapping.registerable? && controller_name != 'registrations' %> + <%= link_to "Sign up", new_registration_path(resource_name) %>
+<% end -%> + +<%- if devise_mapping.recoverable? && controller_name != 'passwords' %> + <%= link_to "Forgot your password?", new_password_path(resource_name) %>
+<% end -%> + +<%- if devise_mapping.confirmable? && controller_name != 'confirmations' %> + <%= link_to "Didn't receive confirmation instructions?", new_confirmation_path(resource_name) %>
+<% end -%> + +<%- if devise_mapping.lockable? && resource_class.unlock_strategy_enabled?(:email) && controller_name != 'unlocks' %> + <%= link_to "Didn't receive unlock instructions?", new_unlock_path(resource_name) %>
+<% end -%> + +<%- if devise_mapping.omniauthable? %> + <%- resource_class.omniauth_providers.each do |provider| %> + <%= link_to "Sign in with #{provider.to_s.titleize}", omniauth_authorize_path(resource_name, provider) %>
+ <% end -%> +<% end -%> \ No newline at end of file diff --git a/app/views/devise/unlocks/new.html.erb b/app/views/devise/unlocks/new.html.erb new file mode 100644 index 00000000..c6cdcfe5 --- /dev/null +++ b/app/views/devise/unlocks/new.html.erb @@ -0,0 +1,12 @@ +

Resend unlock instructions

+ +<%= form_for(resource, :as => resource_name, :url => unlock_path(resource_name), :html => { :method => :post }) do |f| %> + <%= devise_error_messages! %> + +
<%= f.label :email %>
+ <%= f.email_field :email %>
+ +
<%= f.submit "Resend unlock instructions" %>
+<% end %> + +<%= render :partial => "devise/shared/links" %> \ No newline at end of file diff --git a/app/views/layouts/_orbit_bar.html.erb b/app/views/layouts/_orbit_bar.html.erb index d6e5217e..d8ab0540 100644 --- a/app/views/layouts/_orbit_bar.html.erb +++ b/app/views/layouts/_orbit_bar.html.erb @@ -1,9 +1,3 @@ -<% if controller.controller_name.eql?('pages') %> - - - -<% end %> -