1
0
mirror of https://github.com/e107inc/e107.git synced 2025-08-05 14:17:49 +02:00

More bootstrap work.

This commit is contained in:
Cameron
2012-12-11 21:21:25 -08:00
parent 03ad96c309
commit f9d4b0d291
6 changed files with 37 additions and 8 deletions

View File

@@ -404,7 +404,7 @@ class poll
}
$count ++;
}
$SUBMITBUTTON = "<input class='button' type='submit' name='pollvote' value='".POLLAN_30."' />";
$SUBMITBUTTON = "<input class='button btn' type='submit' name='pollvote' value='".POLLAN_30."' />";
if (('preview' == $type || $preview == TRUE) && strpos(e_SELF, "viewtopic") === FALSE)
{
$SUBMITBUTTON = "[".POLLAN_30."]";

View File

@@ -15,8 +15,10 @@ $no_core_css = TRUE;
define("STANDARDS_MODE",TRUE);
// TODO - JS/CSS handling via JSManager
function theme_head() {
function theme_head()
{
return;
$theme_pref = e107::getThemePref();
$ret = '';
@@ -46,7 +48,7 @@ function theme_head() {
return $ret;
}
function tablestyle($caption, $text, $mod)
function tablestyle($caption, $text, $mode)
{
global $style;
@@ -56,6 +58,19 @@ function tablestyle($caption, $text, $mod)
$type = 'box';
}
if($mode == 'wm')
{
echo '<div class="hero-unit">
<h1>'.$caption.'</h1>
<p>'.$text.'</p>
<p><a class="btn btn-primary btn-large">Learn more &raquo;</a></p>
</div>';
return;
}
switch($type)
{
//FIXME Use Bootstrap css. ie. span4 etc.
@@ -68,6 +83,15 @@ function tablestyle($caption, $text, $mod)
';
break;
case 'span4' :
echo '
<div class="span4">
<h2>'.$caption.'</h2>
<p>'.$text.'</p>
</div><!--/span-->
';
break;
case 'box':
echo '
<div class="block">
@@ -115,11 +139,16 @@ $HEADER['default'] = '
<div class="span3">
<div class="well sidebar-nav">
{NAVIGATION=side}
</div><!--/.well -->
{SETSTYLE=menu}
{MENU=1}
</div><!--/span-->
<div class="span9">
';
$FOOTER['default'] = '
{SETSTYLE=span4}
{MENU=2}
</div><!--/span-->
</div><!--/row-->

View File

@@ -51,7 +51,7 @@ if(!isset($FPW_TABLE))
$FPW_TABLE .="
<tr style='vertical-align:top'>
<td class='forumheader' colspan='2' style='text-align:center'>
<input class='button' type='submit' name='pwsubmit' value='".LAN_156."' />
<input class='button btn' type='submit' name='pwsubmit' value='".LAN_156."' />
</td>
</tr>
</table>

View File

@@ -12,7 +12,7 @@ if (!defined('SEARCH_SHORTCODE_REF')) {
if (!isset($SEARCH_SHORTCODE)) {
$SEARCH_SHORTCODE = "<input class='tbox search' type='text' name='q' size='20' value='' maxlength='50' />
<input class='button search' type='submit' name='s' value=\"".LAN_180."\" />";
<input class='button btn search' type='submit' name='s' value=\"".LAN_180."\" />";
/* // Image Version Example
$SEARCH_SHORTCODE = "<input class='tbox search' type='text' name='q' size='20' value='Default Value' maxlength='50' onclick=\"this.value=''\" />

View File

@@ -236,7 +236,7 @@ if(!defined($SIGNUP_BODY))
{SIGNUP_IMAGECODE}
<tr style='vertical-align:top'>
<td class='forumheader' colspan='2' style='text-align:center'>
<input class='button' type='submit' name='register' value=\"".LAN_SIGNUP_79."\" />
<input class='button btn' type='submit' name='register' value=\"".LAN_SIGNUP_79."\" />
<br />
</td>
</tr>

View File

@@ -166,7 +166,7 @@ $USERSETTINGS_EDIT = "
{SIGNATURE_HELP}
<tr style='vertical-align:top'>
<td colspan='2' style='text-align:center' class='forumheader'><input class='button' type='submit' name='updatesettings' value='".LAN_USET_37."' /></td>
<td colspan='2' style='text-align:center' class='forumheader'><input class='button btn' type='submit' name='updatesettings' value='".LAN_USET_37."' /></td>
</tr>
</table>
</div>