diff options
Diffstat (limited to 'web')
-rw-r--r-- | web/post3.js | 7 | ||||
-rw-r--r-- | web/scripts3.js | 24 | ||||
-rw-r--r-- | web/style3.css | 112 |
3 files changed, 96 insertions, 47 deletions
diff --git a/web/post3.js b/web/post3.js index 31b3f8f2a..3267f9c01 100644 --- a/web/post3.js +++ b/web/post3.js @@ -25,7 +25,12 @@ function addLocation() { } function addTag(tag) { - document.forms["postmsg"].body.value='*'+tag+' '+document.forms["postmsg"].body.value; + var s = document.forms["postmsg"].body.value; + if (s.indexOf ('#') == 0) { + document.forms["postmsg"].body.value = s + ' *' + tag; + } else { + document.forms["postmsg"].body.value = '*' + tag + ' ' + s; + } return false; } diff --git a/web/scripts3.js b/web/scripts3.js index bf3da76f6..580546d2b 100644 --- a/web/scripts3.js +++ b/web/scripts3.js @@ -39,7 +39,7 @@ function showCommentForm(mid,rid) { var c=$('#replies #'+rid+' .msg-comment'); c.wrap('<form action="/post" method="POST" enctype="multipart/form-data"/>'); c.before('<input type="hidden" name="mid" value="'+mid+'"/><input type="hidden" name="rid" value="'+rid+'"/>'); - c.append('<textarea name="body" rows="1" class="reply" placeholder="Add a comment..." onkeypress="postformListener(this.form,event)"></textarea><input type="submit" value="OK"/>'); + c.append('<textarea name="body" rows="1" class="reply narrow" placeholder="Add a comment..." onkeypress="postformListener(this.form,event)"></textarea><input type="submit" value="OK"/>'); } // $('#replies #'+rid+' .msg-links').hide(); $('#replies #'+rid+' .msg-comment').show(); @@ -63,8 +63,28 @@ function unfoldReply() { } $(document).ready(function() { - $('textarea.reply').autoResize({ + var tareply=$('textarea.reply'); + tareply.autoResize({ extraSpace: 0, minHeight: 1 }); + tareply.click(function () { + $(this).addClass("narrow"); + $(this).after('<input type="submit" value="OK"/>'); + $(this).off('click'); + }); + + if(!!$('.stickya').offset()) { + var stickyTop = $('.stickya').offset().top; + $(window).scroll(function() { + var windowTop = $(window).scrollTop(); + if (stickyTop < windowTop) { + $('.stickya').css({ + position:'fixed' + }); + } else { + $('.stickya').css('position','absolute'); + } + }); + } }); diff --git a/web/style3.css b/web/style3.css index fac16fdc9..cc74497c7 100644 --- a/web/style3.css +++ b/web/style3.css @@ -3,31 +3,39 @@ body { margin: 0; padding: 0; } h1,h2 { font-weight: normal; } ul { list-style-type: none; } a { text-decoration: none; } -hr { display: none; } img { border: none; } +form { margin: 0; } /********/ -#header { width: 900px; margin: 0 auto; } -#logo { float: left; margin: 8px 16px 0 0; } +#title-container, #topwrapper { width: 100%; min-width: 1000px; max-width: 1024px; margin: 0 auto; } + +/********/ + +#hwrapper { width: 100%; } +#header { height: 48px; width: 1000px; margin: 0 auto; } +#logo { float: left; margin: 3px 0 0 30px; } #header ul { margin: 0; padding: 0; } #header a { text-decoration: none; font-size: 18px; } -#nav li { float: left; } +#search { float: left; margin: 5px 0 0 32px; } +#search .text { width: 300px; padding: 4px; border-radius: 2px; } +#search .submit { padding: 3px; margin-left: 5px; border-radius: 2px; } + #nav-right { float: right; } #nav-right li { float: left; } -#header ul a { display: block; line-height: 56px; padding: 0 20px; } +#header ul a { display: block; line-height: 48px; padding: 0 20px 0 20px; } #nav-right img { vertical-align: middle; margin: 0 4px 0 0; } #nav-menu { display: none; position: absolute; z-index: 1; } #nav-menu li { float: none; } /********/ -#title { clear: both; width: 100%; border-top: 1px solid; border-bottom: 1px solid; background: #F0F0F0; } -#title>h1 { width: 900px; margin: 20px auto; font-size: 28px; } +#title { display: none; clear: both; width: 100%; border-top: 1px solid; border-bottom: 1px solid; } +#title>h1 { margin: 20px auto; font-size: 28px; } -#title-container { width: 900px; margin: 20px auto; min-height: 100px; } +#title-container { margin: 20px auto; min-height: 100px; } #title-av { width: 100px; height: 100px; margin-left: 20px; float: left; } #title-av img { vertical-align: top; padding: 2px; } #title-stats { width: 200px; float: right; border-left: 1px solid; } @@ -37,34 +45,37 @@ img { border: none; } /********/ -#wrapper { width: 900px; margin: 0 auto; } -#content { width: 640px; margin-left: 260px; float: left; } +#topwrapper { position: relative; } +#wrapper { width: 100%; float: left; } +#content { width: 600px; margin: 0 auto; padding: 0; } #content ul { list-style-type: none; margin: 0; padding: 0; } #content li { background-repeat: no-repeat; } /********/ -#geomap { margin-top: 1em; width: 640px; height: 360px; overflow: hidden; } +#filters { display: none; margin: 15px 0; border-bottom: 1px solid; padding: 10px 0; } +#filters li { display: inline; margin-right: 10px; } + +/********/ -#content .msg { padding: 16px 0 0 0; margin: 0 0 16px 0; border-top: 1px solid; width: 640px; } -#content .msg-media { text-align: center; margin-bottom: 10px; } +#geomap { margin-top: 1em; width: 570px; height: 360px; overflow: hidden; } + +#content .msg { padding: 15px; margin: 8px 0 16px 0; width: 570px; border: 1px solid; } #content .msg-avatar { float: left; } #content .msg-avatar img { width: 48px; height: 48px; vertical-align: top; } #content .msg-ts { float: right; } -#content .msg-ts a { font-size: small; } -#content .msg-menu { margin: 0 8px; display: inline; position: relative; } -#content .msg-menu img { vertical-align: top; } -#content .msg-menu ul { display: none; position: absolute; top: 20px; right: 0; width: 300px; margin: 0; padding: 5px; } -#content .msg-menu li { margin: 0; padding: 10px 5px; } +#content .msg-ts>a { font-size: small; vertical-align: top; } #content .msg-header { margin-left: 58px; overflow: hidden; } -#content .msg-txt { margin-left: 58px; padding: 6px 0 0 0; } -#content .msg-links { font-size: small; margin: 10px 0 0 68px; } -#content .msg-comments { margin: 10px 0 0 58px; padding: 5px 20px; overflow: hidden; font-size: small; } -#content .msg-comment { margin: 10px 0 0 58px; padding: 0px 0 0 20px; } -#content .msg-comment textarea { border: 1px solid; width: 500px; padding: 2px; resize: vertical; } -#content .msg-comment input { border: 1px solid; width: 50px; margin-left: 5px; vertical-align: top; } +#content .msg-txt { margin: 8px 0 8px 58px; padding: 0; } +#content .msg-media { text-align: center; margin: 8px 0 0px 58px; } +#content .msg-links { font-size: small; margin: 8px 0 0 68px; } +#content .msg-comments { margin: 10px 0 0 58px; padding: 5px 0 0 10px; overflow: hidden; font-size: small; border-top: 1px solid; } +#content .msg-comment { margin: 8px 0 0 58px; } +#content .msg-comment textarea { border: 1px solid; width: 505px; padding: 2px; resize: vertical; } +#content .msg-comment textarea.narrow { width: 450px; } +#content .msg-comment input { border: 1px solid; width: 50px; margin-left: 6px; vertical-align: top; } -#content textarea.newmessage { border: 1px solid; width: 640px; padding: 2px; resize: vertical; } +#content textarea.newmessage { border: 1px solid; width: 570px; padding: 2px; resize: vertical; } table.users { width: 100%; margin: 10px 0; } table.users td { width: 33%; padding: 6px 0; overflow: hidden; } @@ -72,7 +83,7 @@ table.users img { width: 32px; height: 32px; vertical-align: middle; margin-righ #chats li { margin: 16px; } -.title2 { padding: 10px 20px; margin: 20px 0 10px 0; } +.title2 { padding: 10px 20px; margin: 20px 0 20px 0; } .title2-right { float: right; line-height: 24px; } .title2 h2 { margin: 0; font-size: 24px; } @@ -84,43 +95,56 @@ table.users img { width: 32px; height: 32px; vertical-align: middle; margin-righ /********/ -#column { float: left; width: 210px; margin-left: -900px; } +#column { width: 200px; position: absolute; top: 0px; padding-top: 10px; } #column ul { margin: 8px 0 0 0; padding: 0; } -#column li { margin: 0; padding: 2px 0 2px 10px; } -#column p { font-size: 14px; margin: 0 0 0 10px; } -#column .inp { width: 195px; } -#column h2 { border-bottom: 1px solid; font-size: 18px; margin: 24px 0 8px 0; padding: 0 2px 2px 2px; } +#column li { margin: 0; padding: 0; } +#column li a { display: block; padding: 3px 0 3px 10px; } +#column p { font-size: small; margin: 10px 5px 0 10px; line-height: 130%; } +#column hr { height: 1px; border: none; width: 190px; margin: 10px 0 10px 10px;} +#column .inp { width: 185px; border: 1px solid; padding: 3px; border-radius: 3px; } +#column h2 { display: none; border-bottom: 1px solid; font-size: 18px; margin: 24px 0 8px 0; padding: 0 2px 2px 2px; } #column h2>a { float: right; } /********/ -#footer { clear: both; width: 900px; margin: 0 auto; font-size: small; padding: 25px 0 10px; } +#rcol { float: left; margin-left: -200px; } + +/********/ + +#footer { clear: both; width: 590px; margin: 0 auto; font-size: small; padding: 15px 0 10px 0; } #footer-right { float: right; } /******************************************************************************/ -html { background: #FFF; color: #000; } +html { background: #EEEEE5; color: #000; } a { color: #069; } -#header li a:hover { background: #E0F0FF; } -#title { border-color: #CCC; } +#hwrapper { background: #333; } +#header a { color: #AAA; } +#header li a:hover { background: #444; } +#title { border-color: #CCC; background: #F0F0F0; } #nav-menu { background: #DDD; } #title-stats { border-color: #CCC; } - -#content .msg { border-color: #DDD; } -#content .msg-comments { background: #F5F5F5; color: #999; } -#content .msg-ts a { color: #999; } +#search .text { border: none; background-color: #EEE; } +#search .submit { border: none; background-color: #DDD; } + +#content { } +#filters { border-color: #CCC; } +#filters a { color: #999; } +#content .msg { background: #FFF; border-color: #EEE; } +#content .msg-comments { color: #AAA; border-color: #DDD; } +#content .msg-ts>a { color: #999; } #content .msg-links { color: #999; } #content .msg-comment textarea { border-color: #DDD; } #content .msg-comment input { border-color: #CCC; background-color: #EEE; color: #999; } -#content .msg-menu ul { background: #DDD; } -#content .msg-menu a { color: #000; } #content textarea.newmessage { border-color: #DDD; } -.title2 { background: #F0F0F0; } -.page { background: #F0F0F0; } +.title2 { background: #DDDDD0; } +.page { background: #E5E5DD; } -#column li:hover { background: #E0F0FF; } +#column li:hover { background: #D0E0EE; } #column h2 { border-color: #CCC; } +#column hr { background-color: #CCC; } +#column .inp { border-color: #CCC; background: #F5F5E9; } #footer { color: #999; } |