mirror/php-e107
1
0
Fork 0
mirror of https://github.com/e107inc/e107.git synced 2025-08-02 20:57:26 +02:00
Code Issues Releases Wiki Activity

Forum-update fixes

Browse Source
This commit is contained in:
Cameron
2013-04-21 21:31:42 -07:00
parent f07a214809
commit 449f31546a
6 changed files with 308 additions and 529 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
e107_core/shortcodes/single/user_avatar.php
View File

@@ -5,8 +5,8 @@ function user_avatar_shortcode($parm='')
global $loop_uid; global $loop_uid;
$height = e107::getPref("im_height"); $height = e107::getPref("im_height",100);
$width = e107::getPref("im_width"); $width = e107::getPref("im_width",100);
$tp = e107::getParser(); $tp = e107::getParser();
if(intval($loop_uid) > 0 && trim($parm) == "") if(intval($loop_uid) > 0 && trim($parm) == "")
@@ -65,7 +65,7 @@ function user_avatar_shortcode($parm='')
$img = $tp->thumbUrl(e_IMAGE."generic/blank_avatar.jpg","w=".$width."&h=".$height,true); $img = $tp->thumbUrl(e_IMAGE."generic/blank_avatar.jpg","w=".$width."&h=".$height,true);
} }
$text = "<img class='user-avatar e-tip' src='".$img."' alt='' style='width:".$width."px; height:".$height."px' />"; $text = "<img class='img-rounded user-avatar e-tip' src='".$img."' alt='' style='width:".$width."px; height:".$height."px' />";
// return $img; // return $img;
return $text; return $text;

2
e107_plugins/forum/forum_setup.php
View File

@@ -61,7 +61,7 @@ class forum_setup
{ {
//Redirect upgrade to customized upgrade routine //Redirect upgrade to customized upgrade routine
e107::getRedirect()->redirect(e_PLUGIN.'forum/forum_update.php'); e107::getRedirect()->redirect(e_PLUGIN_ABS.'forum/forum_update.php');
//header('Location: '.e_PLUGIN.'forum/forum_update.php'); //header('Location: '.e_PLUGIN.'forum/forum_update.php');
} }

750
e107_plugins/forum/forum_update.php
View File

File diff suppressed because it is too large Load Diff

2
e107_plugins/forum/templates/forum_viewforum_template.php
View File

@@ -283,7 +283,7 @@ $FORUM_CRUMB['forum']['value'] = "{FORUM_TITLE}";
// <small>{BREADCRUMB}</small> //FIXME Breadcrumb looks crummy // <small>{BREADCRUMB}</small> //FIXME Breadcrumb looks crummy
$FORUM_VIEWFORUM_TEMPLATE['start'] = ""; $FORUM_VIEWFORUM_TEMPLATE['start'] = "";
$FORUM_VIEWFORUM_TEMPLATE['header'] = "<div class='row-fluid'><div class='span6 pull-left'>{BACKLINK}</div> </div> $FORUM_VIEWFORUM_TEMPLATE['header'] = "<div class='row-fluid'><div>{BACKLINK}</div> </div>
<div class='row-fluid'> <div class='row-fluid'>
<div class='span9 pull-left'><h3>{FORUMTITLE}</h3></div> <div class='span9 pull-left'><h3>{FORUMTITLE}</h3></div>
<div class='span3 pull-right right' style='padding-top:10px'>{NEWTHREADBUTTONX}</div></div> <div class='span3 pull-right right' style='padding-top:10px'>{NEWTHREADBUTTONX}</div></div>

12
e107_plugins/forum/templates/forum_viewtopic_template.php
View File

@@ -25,6 +25,11 @@ $sc_style['ATTACHMENTS']['post'] = "</div>";
$sc_style['ANON_IP']['pre'] = ""; $sc_style['ANON_IP']['pre'] = "";
$sc_style['ANON_IP']['post'] = ""; $sc_style['ANON_IP']['post'] = "";
$sc_style['CUSTOMTITLE']['pre'] = "<small>";
$sc_style['CUSTOMTITLE']['post'] = "</small>";
$sc_style['USER_EXTENDED']['location.text_value']['mid'] = ": "; $sc_style['USER_EXTENDED']['location.text_value']['mid'] = ": ";
$sc_style['USER_EXTENDED']['location.text_value']['post'] = "<br />"; $sc_style['USER_EXTENDED']['location.text_value']['post'] = "<br />";
@@ -308,7 +313,7 @@ $FORUM_CRUMB['forum']['value'] = "<a class='forumlink' href='{FORUM_HREF}'>{FORU
$FORUM_VIEWTOPIC_TEMPLATE['start'] = " $FORUM_VIEWTOPIC_TEMPLATE['start'] = "
<div class='row-fluid'> <div class='row-fluid'>
<div class='span6 pull-left'>{BACKLINK}</div> <div>{BACKLINK}</div>
</div> </div>
<div class='row-fluid'> <div class='row-fluid'>
@@ -336,10 +341,9 @@ $FORUM_VIEWTOPIC_TEMPLATE['thread'] = "
<div class='row-fluid' > <div class='row-fluid' >
<div class='span2 center'> <div class='span2 center'>
{CUSTOMTITLE}
{AVATAR}<br /> {AVATAR}<br />
{USERCOMBO} {USERCOMBO}<br />
{CUSTOMTITLE}
</div> </div>
<div class='span9 '> <div class='span9 '>
{POLL} {POLL}

19
e107_web/js/core/admin.jquery.js
View File

@@ -121,6 +121,25 @@ $(document).ready(function()
); );
$('button[data-loading-text],a[data-loading-text]').on('click', function()
{
var caption = $(this).attr('data-loading-text');
$(this).attr('disabled', 'disabled').html(caption);
return true;
}
);
$('input[data-loading-text]').on('click', function()
{
var caption = $(this).attr('data-loading-text');
$(this).val(caption);
$(this).removeClass('btn-success');
//$(this).attr('disabled', 'disabled').val(caption);
return true;
}
);
/* Bootstrap Modal window within an iFrame */ /* Bootstrap Modal window within an iFrame */
$('.e-modal').on('click', function(e) $('.e-modal').on('click', function(e)
{ {