Empty commit

This commit is contained in:
Git 2013-11-04 08:01:08 +00:00
parent b48eab60e7
commit 0060b74688
16 changed files with 84 additions and 107 deletions

View File

@ -312,12 +312,12 @@ public static function release_order(&$SiteOptions, $Default = false) {
foreach ($Sort as $Key => $Val) {
if (isset($Defaults)) {
$Checked = ($Defaults && isset($SiteOptions['HideTypes'][$Key]) ? ' checked="checked"' : '');
$Checked = $Defaults && isset($SiteOptions['HideTypes'][$Key]) ? ' checked="checked"' : '';
} else {
if (!isset($RT[$Key])) {
continue;
}
$Checked = ($Val ? ' checked="checked"' : '');
$Checked = $Val ? ' checked="checked"' : '';
$Val = $RT[$Key];
}
@ -529,15 +529,15 @@ public static function format_username($UserID, $Badges = false, $IsWarned = tru
$IconImage = STATIC_SERVER . "common/symbols/donor_{$DonorHeart}.png";
}
}
$Str .= "<a href=\"$IconLink\"><img class=\"donor_icon\" src=\"$IconImage\" alt=\"$IconText\" title=\"$IconText\" /></a>";
$Str .= "<a href=\"$IconLink\"><img class=\"donor_icon tooltip\" src=\"$IconImage\" alt=\"$IconText\" title=\"$IconText\" /></a>";
}
}
$Str .= ($IsWarned && $UserInfo['Warned'] != '0000-00-00 00:00:00') ? '<a href="wiki.php?action=article&amp;id=218"'
. '><img src="'.STATIC_SERVER.'common/symbols/warned.png" alt="Warned" title="Warned'
. (G::$LoggedUser['ID'] === $UserID ? ' - Expires ' . date('Y-m-d H:i', strtotime($UserInfo['Warned'])) : '')
. '" /></a>' : '';
$Str .= ($IsEnabled && $UserInfo['Enabled'] == 2) ? '<a href="rules.php"><img src="'.STATIC_SERVER.'common/symbols/disabled.png" alt="Banned" title="Be good, and you won\'t end up like this user" /></a>' : '';
. '" class="tooltip" /></a>' : '';
$Str .= ($IsEnabled && $UserInfo['Enabled'] == 2) ? '<a href="rules.php"><img src="'.STATIC_SERVER.'common/symbols/disabled.png" alt="Banned" title="Be good, and you won\'t end up like this user" class="tooltip" /></a>' : '';
if ($Badges) {
$ClassesDisplay = array();
@ -692,9 +692,9 @@ public static function show_avatar($Avatar, $UserID, $Username, $Setting, $Size
$URL = 'https://robohash.org/'.md5($Username)."?set=set$Type&amp;size={$Size}x$Size";
}
if ($ShowAvatar == true && !empty($Avatar)) {
$ToReturn = ($ReturnHTML ? "<img src=\"$Avatar\" width=\"$Size\" $Style $AvatarMouseOverText$SecondAvatar $Class/>" : $Avatar);
$ToReturn = ($ReturnHTML ? "<img src=\"$Avatar\" width=\"$Size\" $Style $AvatarMouseOverText$SecondAvatar $Class />" : $Avatar);
} else {
$ToReturn = ($ReturnHTML ? "<img src=\"$URL\" width=\"$Size\" $Style $AvatarMouseOverText$SecondAvatar $Class/>" : $URL);
$ToReturn = ($ReturnHTML ? "<img src=\"$URL\" width=\"$Size\" $Style $AvatarMouseOverText$SecondAvatar $Class />" : $URL);
}
break;
default:

View File

@ -151,7 +151,7 @@
}
}
?>
<input type="button" value="Preview" class="hidden button_preview_<?=$ReplyText->getID()?>" title="Preview text" tabindex="1" />
<input type="button" value="Preview" class="hidden button_preview_<?=$ReplyText->getID()?>" tabindex="1" />
<input type="submit" value="Post reply" id="submit_button" tabindex="1" />
</div>
</form>

View File

@ -18,8 +18,8 @@
<option value="700">Staff</option>
</select>
<input type="button" value="Preview" class="hidden button_preview_<?=$TextPrev->getID()?>" title="Preview text" />
<input type="button" value="Preview" class="hidden button_preview_<?=$TextPrev->getID()?>" />
<input type="submit" value="Send message" />
<input type="button" value="Hide" onclick="$('#compose').gtoggle();return false;" />
<input type="button" value="Hide" onclick="$('#compose').gtoggle(); return false;" />
</form>
</div>
</div>

View File

@ -1,4 +1,3 @@
<div class="submit_div preview_submit">
<input type="button" value="Preview" class="hidden button_preview_<?=$ID?>" title="Preview text" />
<input type="button" value="Preview" class="hidden button_preview_<?=$ID?>" />
</div>

View File

@ -466,12 +466,13 @@
if ($PostID == $ThreadInfo['StickyPostID']) { ?>
<strong><span class="sticky_post_label" class="brackets">Sticky</span></strong>
<? if (check_perms('site_moderate_forums')) { ?>
- <a href="forums.php?action=sticky_post&amp;threadid=<?=$ThreadID?>&amp;postid=<?=$PostID?>&amp;remove=true&amp;auth=<?=$LoggedUser['AuthKey']?>" class="brackets">X</a>
- <a href="forums.php?action=sticky_post&amp;threadid=<?=$ThreadID?>&amp;postid=<?=$PostID?>&amp;remove=true&amp;auth=<?=$LoggedUser['AuthKey']?>" title="Unsticky this post" class="brackets tooltip">X</a>
<?
}
} else {
if (check_perms('site_moderate_forums')) { ?>
- <a href="forums.php?action=sticky_post&amp;threadid=<?=$ThreadID?>&amp;postid=<?=$PostID?>&amp;auth=<?=$LoggedUser['AuthKey']?>" class="brackets">&#x21d5;</a>
if (check_perms('site_moderate_forums')) {
?>
- <a href="forums.php?action=sticky_post&amp;threadid=<?=$ThreadID?>&amp;postid=<?=$PostID?>&amp;auth=<?=$LoggedUser['AuthKey']?>" title="Sticky this post" class="brackets tooltip">&#x21d5;</a>
<?
}
}
@ -515,7 +516,7 @@
<a href="#content<?=$PostID?>" onclick="LoadEdit('forums', <?=$PostID?>, 1); return false;">&laquo;</a>
<? } ?>
Last edited by
<?=Users::format_username($EditedUserID, false, false, false, false, false, $IsDonorForum) ?> <?=time_diff($EditedTime,2,true,true)?>
<?=Users::format_username($EditedUserID, false, false, false, false, false, $IsDonorForum) ?> <?=time_diff($EditedTime, 2, true, true)?>
<? } ?>
</div>
</td>

View File

@ -233,7 +233,7 @@
<? if ($IsFLS) { //Moved by request ?>
<input type="button" value="Common answers" onclick="$('#common_answers').gtoggle();" />
<? } ?>
<input type="button" id="previewbtn" value="Preview" class="hidden button_preview_<?=$TextPrev->getID()?>" title="Preview text" />
<input type="button" id="previewbtn" value="Preview" class="hidden button_preview_<?=$TextPrev->getID()?>" />
<input type="submit" value="Send message" />
<? } else { ?>
<input type="button" value="Unresolve" onclick="location.href='staffpm.php?action=unresolve&amp;id=<?=$ConvID?>';" />

View File

@ -14,12 +14,10 @@
<br />
<div class="thin">
<table class="forum_post wrap_overflow box vertical_margin">
<tbody>
<tr>
<td class="body" id="preview">
</td>
</tr>
</tbody>
<tr>
<td class="body" id="preview">
</td>
</tr>
</table>
</div>
</div>

View File

@ -27,7 +27,7 @@
<strong>Restrict edit:</strong> <select name="minclassedit"><?=class_list()?></select>
<? } ?>
<div style="text-align: center;">
<input type="button" value="Preview" class="hidden button_preview_<?=$ReplyText->getID()?>" title="Preview text" tabindex="1" />
<input type="button" value="Preview" class="hidden button_preview_<?=$ReplyText->getID()?>" tabindex="1" />
<input type="submit" value="Submit" />
</div>
</div>

View File

@ -1,5 +1,5 @@
<?
if (!is_number($_GET['id']) || $_GET['id'] == '') {
if (!is_number($_GET['id']) || $_GET['id'] === '') {
error(404);
}
$ArticleID = $_GET['id'];
@ -26,14 +26,15 @@
<?
$ReplyText = new TEXTAREA_PREVIEW('body', 'body', $Body, 91, 22, true, false);
if (check_perms('admin_manage_wiki')) { ?>
if (check_perms('admin_manage_wiki')) {
?>
<h3>Access</h3>
<p>There are some situations in which the viewing or editing of an article should be restricted to a certain class.</p>
<strong>Restrict read:</strong> <select name="minclassread"><?=class_list($Read)?></select>
<strong>Restrict edit:</strong> <select name="minclassedit"><?=class_list($Edit)?></select>
<? } ?>
<div style="text-align: center;">
<input type="button" value="Preview" class="hidden button_preview_<?=$ReplyText->getID()?>" title="Preview text" tabindex="1" />
<input type="button" value="Preview" class="hidden button_preview_<?=$ReplyText->getID()?>" tabindex="1" />
<input type="submit" value="Submit" />
</div>
</div>

View File

@ -1,43 +0,0 @@
function charCount() {
var count = document.getElementById("message").value.length;
document.getElementById("length").innerHTML = count + "/100";
if (count > 100) {
document.getElementById("length").innerHTML = "<strong class=\"important_text\">Exceeded max rippy length!</strong>";
}
}
function changeRippyImage() {
var id = $("#rippy_image").val();
var image = "";
switch (parseInt(id)) {
case 0:
image = "rippy.png";
break;
case 1:
image = "ripella.png";
break;
case 2:
image = "rippy_bday.png";
break;
case 3:
image = "rippy_halloween_1.png";
break;
case 4:
image = "loggy.png";
break;
case 5:
image = "rippy_gold.png";
break;
case 6:
image = "cassie.png";
break;
case 7:
image = "drone.png";
break;
default:
image = "rippy.png";
break;
}
$("#rippy_preview").raw().src = "static/rippy/" + image;
}

View File

@ -29,7 +29,8 @@ $(document).ready(function () {
this.el.preview
.on('dblclick.preview', $.proxy(this.toggle, this))
.addClass('text_preview')
.attr('title', 'Double click to edit.');
.addClass('tooltip')
.attr('title', 'Double-click to edit');
this.buttons.preview
.on('click.preview', $.proxy(this.get, this))
@ -61,7 +62,7 @@ $(document).ready(function () {
&& this.el.textarea.val().length > 0) {
this.toggle();
if (this.last !== this.el.textarea.val()) {
this.el.preview.text('Loading . . .');
this.el.preview.text('Loading...');
this.last = this.el.textarea.val();
this.post();
}
@ -82,4 +83,4 @@ $(document).ready(function () {
this.el.preview.html(data);
}
};
});
});

View File

@ -111,8 +111,8 @@ h1,h2,h3,h4{
}
.nobr {
white-space:nowrap;
font-weight: normal ;
white-space: nowrap;
font-weight: normal;
}
.rowa td {

View File

@ -335,7 +335,7 @@ tr.torrent .bookmark>a:after {
.ui-state-highlight {
background: #007DC6 /*{bgColorHighlight}*/;
opacity : 0.15;
opacity: 0.15;
width: 50%;
}
@ -413,7 +413,7 @@ tr.torrent .bookmark>a:after {
content: "";
}
.group_image {
overflow:hidden;
overflow: hidden;
}
.float_left {
float: left;

View File

@ -119,9 +119,25 @@ textarea#quickpost{margin:0; padding:0}
#userinfo_major>li:first-child + li + li>strong>a { background: transparent no-repeat url(/static/styles/minimal/images/minimal_mod_sprite.png) 0 -725px; }
/* alerts */
#alerts{position:absolute; top:75px; left:0px; z-index:1; font-weight:bold; font-size: 10px; color:#FFF; text-transform: uppercase;}
.alertbar{height:11px; padding:3px; float:left; margin-right: 5px;}
.alertbar a{color: #f60021;}
#alerts {
position: absolute;
top: 75px;
left: 0px;
z-index: 1;
font-weight: bold;
font-size: 10px;
color: #FFF;
text-transform: uppercase;
}
.alertbar {
height: 11px;
padding: 3px;
float: left;
margin-right: 5px;
}
.alertbar a {
color: #f60021;
}
/* searchbars */
#searchbars{margin:10px 210px 0 0px}
@ -135,7 +151,7 @@ textarea#quickpost{margin:0; padding:0}
top: 1em;
left: 0;
z-index: 1000;
border : 1px solid #000;
border: 1px solid #000;
width: 12em;
margin-top: 12px;
}
@ -148,8 +164,12 @@ textarea#quickpost{margin:0; padding:0}
text-align: center;
}
/* TABLE BORDERS */
table tr td{border:1px solid #757575}
#user table tr td{border:0}
table tr td {
border: 1px solid #757575;
}
#user table tr td {
border: 0;
}
/* content */
#content{z-index:0; padding:0; margin:0; position:relative}

View File

@ -405,7 +405,7 @@ ul.thin li { margin:0px 0px; padding:0px; }
top: 1em;
left: 0;
z-index: 1000;
border : 1px solid #EEE;
border: 1px solid #EEE;
background: url('images/content.png');
width: 12em;
margin-top: 12px;

View File

@ -8,25 +8,25 @@
*/
* {
margin:0;
padding:0;
border:none;
outline:none;
margin: 0;
padding: 0;
border: none;
outline: none;
}
/*General Mosaic Styles*/
.mosaic-block {
display: inline-block;
position:relative;
overflow:hidden;
width:250px;
height:250px;
margin:10px;
position: relative;
overflow: hidden;
width: 250px;
height: 250px;
margin: 10px;
text-align: left;
}
.mosaic-backdrop {
display:none;
display: none;
}
.mosaic-backdrop img {
@ -34,28 +34,28 @@
}
.mosaic-overlay {
display:none;
z-index:5;
position:absolute;
display: none;
z-index: 5;
position: absolute;
width: 246px;
margin-left: 2px;
height:100%;
background:#111;
height: 100%;
background: #111;
text-shadow: none;
}
.bar2 .mosaic-overlay {
bottom:-80px;
height:100px;
opacity:0.8;
bottom: -80px;
height: 100px;
opacity: 0.8;
-ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=80)";
filter:alpha(opacity=80);
filter: alpha(opacity=80);
}
.bar2 .mosaic-overlay:hover {
opacity:0.8;
opacity: 0.8;
-ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=80)";
filter:alpha(opacity=80);
filter: alpha(opacity=80);
}
.details {
@ -76,7 +76,7 @@
/*** End Animation Styles ***/
.item_form_table td {
text-align : left;
text-align: left;
}
.store_table {