diff options
Diffstat (limited to 'view')
| -rw-r--r-- | view/js/mod_settings.js | 5 | ||||
| -rw-r--r-- | view/php/theme_init.php | 6 | ||||
| -rw-r--r-- | view/theme/redbasic/css/style.css | 70 | ||||
| -rw-r--r-- | view/theme/redbasic/php/theme_init.php | 5 | ||||
| -rwxr-xr-x | view/tpl/comment_item.tpl | 2 | ||||
| -rwxr-xr-x | view/tpl/email_notify_html.tpl | 2 | ||||
| -rwxr-xr-x | view/tpl/jot.tpl | 2 | ||||
| -rwxr-xr-x | view/tpl/settings.tpl | 4 |
8 files changed, 51 insertions, 45 deletions
diff --git a/view/js/mod_settings.js b/view/js/mod_settings.js index e749cd761..7f9a9e960 100644 --- a/view/js/mod_settings.js +++ b/view/js/mod_settings.js @@ -3,6 +3,11 @@ var ispublic = aStr['everybody'] ; $(document).ready(function() { + $("a#settings-default-perms-menu").colorbox({ + 'inline' : true, + 'transition' : 'elastic' + }); + $('#contact_allow, #contact_deny, #group_allow, #group_deny').change(function() { var selstr; $('#contact_allow option:selected, #contact_deny option:selected, #group_allow option:selected, #group_deny option:selected').each( function() { diff --git a/view/php/theme_init.php b/view/php/theme_init.php index 69d99893a..f49b9c043 100644 --- a/view/php/theme_init.php +++ b/view/php/theme_init.php @@ -1,20 +1,18 @@ <?php - - require_once('include/plugin.php'); - head_add_css('library/fancybox/jquery.fancybox-1.3.4.css'); head_add_css('library/tiptip/tipTip.css'); head_add_css('library/jgrowl/jquery.jgrowl.css'); head_add_css('library/jslider/css/jslider.css'); head_add_css('library/prettyphoto/css/prettyPhoto.css'); head_add_css('library/colorbox/colorbox.css'); -head_add_css('library/font_awesome/css/font-awesome.min.css'); +// head_add_css('library/font_awesome/css/font-awesome.min.css'); head_add_js('js/jquery.js'); head_add_js('js/jquery-migrate-1.1.1.js'); +//head_add_js('js/jquery-compat.js'); head_add_js('js/spin.js'); head_add_js('js/jquery.spin.js'); head_add_js('js/jquery.textinputs.js'); diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css index 660651a7f..eaa3140c9 100644 --- a/view/theme/redbasic/css/style.css +++ b/view/theme/redbasic/css/style.css @@ -1131,10 +1131,9 @@ footer { margin-left: 50px; } -#profile-jot-plugin-wrapper, #profile-jot-submit-wrapper { - margin-top: 15px; - width:90%; + margin-top: 10px; + width: 90%; } #profile-upload-wrapper { @@ -1195,21 +1194,11 @@ footer { #profile-jot-perms { float: right; - margin-left: 100px; - font-weight: bold; - font-size: 1.2em; - height: auto; - width: auto; - background-color: #0080FF; - border-radius: $radiuspx; - border: 2px outset; - box-shadow: 5px 5px 5px #666; - margin-right: 8px; - padding: 4px; -} - -#profile-jot-perms:active { - box-shadow: 0 0 0 0; + background-color: $toolicon_colour; + border: 1px solid #666; + border-right: none; + border-radius: $radiuspx 0px 0px $radiuspx; + padding: 6px; } #profile-jot-perms-end { @@ -1537,23 +1526,27 @@ tr.mceLast { } #profile-jot-submit { - height: auto; - background-color: #0080FF; - color: #eeeeec; - font-weight: bold; - -webkit-border-radius: $radiuspx; - -moz-border-radius: $radiuspx; - border-radius: $radiuspx; - border: 2px outset #222420 !important; - margin: 0; - float: right; - text-shadow: 1px 1px #111; - width: auto; - box-shadow: 5px 5px 5px #444; + height: 30px; + width: 70px; + background: linear-gradient(top, #0080ff 0%, #0080aa); + background: -webkit-linear-gradient(top, #0080ff 0%, #0080aa); + background: -moz-linear-gradient(top, #0080ff 0%, #0080aa); + background: -o-linear-gradient(top, #0080ff 0%, #0080aa); + background: -ms-linear-gradient(top, #0080ff 0%, #0080aa); + color: #fff; + font-weight: bold; + border-radius: 0px $radiuspx $radiuspx 0px; + float: right; + text-shadow: 1px 1px #111; + cursor: pointer; } -#profile-jot-submit:active { - box-shadow: 0 0 0 0; +#profile-jot-submit:hover { + background: linear-gradient(top, #0080aa 0%, #0080ff); + background: -webkit-linear-gradient(top, #0080aa 0%, #0080ff); + background: -moz-linear-gradient(top, #0080aa 0%, #0080ff); + background: -o-linear-gradient(top, #0080aa 0%, #0080ff); + background: -ms-linear-gradient(top, #0080aa 0%, #0080ff); } #sidebar-page-list .label { @@ -1984,7 +1977,7 @@ a.mail-list-link { display: block; color: #FFFFFF; margin-top: 15px; - background-color: #F80000; + background-color: $nav_bg_2; -webkit-border-radius: $radiuspx ; -moz-border-radius: $radiuspx; border-radius: $radiuspx; @@ -3008,7 +3001,7 @@ div.jGrowl div.info { width: 90%; } - +a.rconnect, nav a, nav a:active, nav a:visited, @@ -3018,7 +3011,7 @@ nav a:link { outline: none; } -nav a:hover { +a.rconnect:hover, nav a:hover { color: #0080FF; } nav .fakelink { @@ -3521,6 +3514,10 @@ margin-right: 50px; color: $toolicon_colour; } +.comment-preview-icon { + margin-left: 15px; +} + .comment-icon:hover, .jot-icons:hover { color: $toolicon_activecolour; @@ -3534,6 +3531,7 @@ margin-right: 50px; a .drop-icons { color: #777; font-size: 1.2em; + text-decoration: none; } .drop-icons:hover { diff --git a/view/theme/redbasic/php/theme_init.php b/view/theme/redbasic/php/theme_init.php new file mode 100644 index 000000000..ccb85a070 --- /dev/null +++ b/view/theme/redbasic/php/theme_init.php @@ -0,0 +1,5 @@ +<?php + +head_add_css('library/font_awesome/css/font-awesome.min.css'); +require_once('view/php/theme_init.php'); + diff --git a/view/tpl/comment_item.tpl b/view/tpl/comment_item.tpl index b8e2b4730..1ea619774 100755 --- a/view/tpl/comment_item.tpl +++ b/view/tpl/comment_item.tpl @@ -61,7 +61,7 @@ <div class="comment-edit-submit-wrapper" id="comment-edit-submit-wrapper-{{$id}}" style="display: none;" > <input type="submit" onclick="post_comment({{$id}}); return false;" id="comment-edit-submit-{{$id}}" class="comment-edit-submit" name="submit" value="{{$submit}}" /> {{if $preview}} - <span onclick="preview_comment({{$id}});" id="comment-edit-preview-link-{{$id}}" class="fakelink">{{$preview}}</span> + <span onclick="preview_comment({{$id}});" id="comment-edit-preview-link-{{$id}}" class="fakelink"><i class="icon-eye-open comment-icon comment-preview-icon" title="{{$preview}}"></i></span> <div id="comment-edit-preview-{{$id}}" class="comment-edit-preview" style="display:none;"></div> {{/if}} </div> diff --git a/view/tpl/email_notify_html.tpl b/view/tpl/email_notify_html.tpl index 41bbe16a9..cf149341e 100755 --- a/view/tpl/email_notify_html.tpl +++ b/view/tpl/email_notify_html.tpl @@ -5,7 +5,7 @@ <meta http-equiv="Content-Type" content="text/html;charset=utf-8" /> </head> <body> -<table style="border:1px solid #ccc"> +<table style="border:1px solid #ccc; background-color: #FFFFFF; color: #000000;"> <tbody> <tr><td colspan="2" style="background:#c60032; color:#FFFFFF; font-weight:bold; font-family:'lucida grande', tahoma, verdana,arial, sans-serif; padding: 4px 8px; vertical-align: middle; font-size:16px; letter-spacing: -0.03em; text-align: left;"><img style="width:32px;height:32px; float:left;" src='{{$siteurl}}/images/rm-32.png'><div style="padding:7px; margin-left: 5px; float:left; font-size:18px;letter-spacing:1px;">{{$product}}</div><div style="clear: both;"></div></td></tr> diff --git a/view/tpl/jot.tpl b/view/tpl/jot.tpl index b9238f0c0..666fae9cd 100755 --- a/view/tpl/jot.tpl +++ b/view/tpl/jot.tpl @@ -71,7 +71,7 @@ </div> {{/if}} - {{if $preview}}<span onclick="preview_post();" id="jot-preview-link" class="fakelink">{{$preview}}</span>{{/if}} + {{if $preview}}<span onclick="preview_post();" id="jot-preview-link" class="fakelink"><i class="icon-eye-open jot-icons" title="{{$preview}}"></i></span>{{/if}} <div id="profile-jot-perms-end"></div> diff --git a/view/tpl/settings.tpl b/view/tpl/settings.tpl index 10378e599..8781304c1 100755 --- a/view/tpl/settings.tpl +++ b/view/tpl/settings.tpl @@ -4,7 +4,7 @@ {{$nickname_block}} <form action="settings" id="settings-form" method="post" autocomplete="off" > -<input type='hidden' name='form_security_token' value='{{$form_security_token}}'> +<input type='hidden' name='form_security_token' value='{{$form_security_token}}' /> <h3 class="settings-heading">{{$h_basic}}</h3> @@ -73,7 +73,7 @@ {{/if}} <div id="settings-default-perms" class="settings-default-perms" > - <a href="#profile-jot-acl-wrapper" id="settings-default-perms-menu" class='popupbox'>{{$permissions}} {{$permdesc}}</a> + <a href="#profile-jot-acl-wrapper" id="settings-default-perms-menu" >{{$permissions}} {{$permdesc}}</a> <div id="settings-default-perms-menu-end"></div> <div id="settings-default-perms-select" style="display: none; margin-bottom: 20px" > |