Update Bootstrap to 3.3.1 - Other minors adjusts

angelorocha · Nov 14, 2014 · 4a0af1f · 4a0af1f
1 parent 13cfb89
commit 4a0af1f
Show file tree

Hide file tree

Showing 10 changed files with 334 additions and 12 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,2 +1,3 @@
 Thumbs.db
-_notes
+_notes
+.idea
diff --git a/css/bootstrap.min.css b/css/bootstrap.min.css
diff --git a/fonts/glyphicons-halflings-regular.svg b/fonts/glyphicons-halflings-regular.svg
diff --git a/js/bootstrap.min.js b/js/bootstrap.min.js
diff --git a/js/js.js b/js/js.js
@@ -18,9 +18,6 @@ jQuery(document).ready(function($) {
 });
 
 jQuery(document).ready(function($){
-//  $('#xoopsgrid').masonry({ singleMode: true});
-    $(window).load(function(){$('#xoopsgrid').masonry(); });
-
     var $container = $('#xoopsgrid').masonry();
     $container.imagesLoaded( function() {
       $container.masonry();

diff --git a/modules/pm/pm_readpmsg.tpl b/modules/pm/pm_readpmsg.tpl
@@ -0,0 +1,80 @@
+<h4><{$smarty.const._PM_PRIVATEMESSAGE}></h4>
+<div class="message-current-tab">
+    <{if $op==out}>
+		<div class="alert alert-success alert-dismissable">
+            <button type="button" class="close" data-dismiss="alert" aria-hidden="true">&times;</button>
+	            <strong><a href="viewpmsg.php?op=out" title="<{$smarty.const._PM_OUTBOX}>"><{$smarty.const._PM_OUTBOX}></a></strong>
+        </div>
+    <{elseif $op == "save"}>
+		<div class="alert alert-success alert-dismissable">
+            <button type="button" class="close" data-dismiss="alert" aria-hidden="true">&times;</button>
+		        <strong><a href="viewpmsg.php?op=save" title="<{$smarty.const._PM_SAVEBOX}>"><{$smarty.const._PM_SAVEBOX}></a></strong>
+		</div>
+    <{else}>
+		<div class="alert alert-success alert-dismissable">
+            <button type="button" class="close" data-dismiss="alert" aria-hidden="true">&times;</button>	
+		        <a href="viewpmsg.php?op=in" title="<{$smarty.const._PM_INBOX}>"><{$smarty.const._PM_INBOX}></a>
+		</div>
+    <{/if}>
+</div>
+
+<{if $message}>
+<blockquote>
+	<p><{$message.subject}></p>
+</blockquote>
+
+<div class="row message-body">
+<form name="<{$pmform.name}>" id="<{$pmform.name}>" action="<{$pmform.action}>" method="<{$pmform.method}>" <{$pmform.extra}>>
+<div class="col-xs-4 col-md-4 sender-info">
+<{if $op==out}><strong><{$smarty.const._PM_TO}>: </strong><{else}><strong><{$smarty.const._PM_FROM}>: </strong><{/if}>
+<{if ( $poster != false ) }>
+<a href="<{$xoops_url}>/userinfo.php?uid=<{$poster->getVar('uid')}>"><{$poster->getVar('uname')}></a>
+<{if ( $poster->getVar("user_avatar") != "")}>
+<img src="<{$xoops_url}>/uploads/<{$poster->getVar('user_avatar')}>" alt="<{$poster->getVar('uname')}>" class="img-responsive img-rounded img-thumbnail">
+<{/if}>
+<{if ( $poster->getVar("user_from") != "" ) }>
+<{$smarty.const._PM_FROMC}><{$poster->getVar("user_from")}>
+<{/if}>
+<{if ( $poster->isOnline() ) }>
+<{$smarty.const._PM_ONLINE}>
+<{/if}>
+<{else}>
+<{$anonymous}>
+<{/if}>
+</div><!-- .sender-info -->
+
+<div class="col-xs-8 col-md-8 message-read">
+<p class="label label-info"><strong><{$smarty.const._PM_SENTC}> </strong><{$message.msg_time}></p>
+
+<p><{$message.msg_text}></p>
+
+<{foreach item=element from=$pmform.elements}>
+	<{$element.body}>
+<{/foreach}>
+
+<div class="aligncenter comments-nav">
+    <{if ($previous >= 0 )}>
+    <a class="btn btn-primary btn-sm" href="readpmsg.php?start=<{$previous}>&amp;total_messages=<{$total_messages}>&amp;op=<{$op}>" title="<{$smarty.const._PM_PREVIOUS}>">
+        <span class="glyphicon glyphicon-circle-arrow-left"></span>
+    </a>
+    <{else}>
+    <button class="btn btn-primary btn-sm" disabled="disabled">
+	    <span class="glyphicon glyphicon-circle-arrow-left"></span>
+    </button>
+    <{/if}>
+    <{if ( $next < $total_messages ) }>
+    <a class="btn btn-primary btn-sm" href="readpmsg.php?start=<{$next}>&amp;total_messages=<{$total_messages}>&amp;op=<{$op}>" title="<{$smarty.const._PM_NEXT}>">
+		<span class="glyphicon glyphicon-circle-arrow-right"></span>
+    </a>
+    <{else}>
+	<button class="btn btn-primary btn-sm" disabled="disabled">
+	    <span class="glyphicon glyphicon-circle-arrow-right"></span>
+    </button>
+    <{/if}>
+    </div><!-- .message-read -->
+    </form>
+    <{else}>
+    <{$smarty.const._PM_YOUDONTHAVE}>
+    <{/if}>
+</div>
+</div><!-- .message-body -->
diff --git a/modules/pm/pm_viewpmsg.tpl b/modules/pm/pm_viewpmsg.tpl
@@ -0,0 +1,159 @@
+<h4><{$smarty.const._PM_PRIVATEMESSAGE}></h4>
+<div class="current-tab">
+    <div class="row">
+        <{if $op == "out"}>
+            <div class="col-xs-6 col-md-6">
+            <a class="btn btn-info btn-block" href="viewpmsg.php?op=in" title="<{$smarty.const._PM_INBOX}>"><{$smarty.const._PM_INBOX}></a>
+            </div>
+
+            <div class="col-xs-6 col-md-6">
+            <a class="btn btn-info btn-block" href="viewpmsg.php?op=save" title="<{$smarty.const._PM_SAVEBOX}>"><{$smarty.const._PM_SAVEBOX}></a>
+            </div>
+        <{elseif $op == "save"}>
+            <div class="col-xs-6 col-md-6">
+            <a class="btn btn-info btn-block" href="viewpmsg.php?op=in" title="<{$smarty.const._PM_INBOX}>"><{$smarty.const._PM_INBOX}></a>
+            </div>
+
+            <div class="col-xs-6 col-md-6">
+            <a class="btn btn-info btn-block" href="viewpmsg.php?op=out" title="<{$smarty.const._PM_OUTBOX}>"><{$smarty.const._PM_OUTBOX}></a>
+            </div>
+        <{elseif $op == "in"}>
+            <div class="col-xs-6 col-md-6">
+            <a class="btn btn-info btn-block" href="viewpmsg.php?op=out" title="<{$smarty.const._PM_OUTBOX}>"><{$smarty.const._PM_OUTBOX}></a>
+            </div>
+
+            <div class="col-xs-6 col-md-6">
+            <a class="btn btn-info btn-block" href="viewpmsg.php?op=save" title="<{$smarty.const._PM_SAVEBOX}>"><{$smarty.const._PM_SAVEBOX}></a>
+            </div>
+        <{/if}>
+    </div>
+</div><!-- .current-tab -->
+
+<div class="message-current-tab">
+    <{if $op == "out"}>
+        <div class="alert alert-success alert-dismissable">
+        <button type="button" class="close" data-dismiss="alert" aria-hidden="true">&times;</button>
+            <strong><{$smarty.const._PM_OUTBOX}></strong>
+        </div>
+    <{elseif $op == "save"}>
+        <div class="alert alert-success alert-dismissable">
+        <button type="button" class="close" data-dismiss="alert" aria-hidden="true">&times;</button>
+            <strong><{$smarty.const._PM_SAVEBOX}></strong>
+        </div>
+    <{else}>
+        <div class="alert alert-success alert-dismissable">
+        <button type="button" class="close" data-dismiss="alert" aria-hidden="true">&times;</button>
+            <strong><{$smarty.const._PM_INBOX}></strong>
+        </div>
+    <{/if}>
+</div><!-- .message-current-tab -->
+
+<{if $msg}>
+    <div class="alert alert-info alert-dismissable">
+    <button type="button" class="close" data-dismiss="alert" aria-hidden="true">&times;</button>
+        <strong><{$msg}></strong>
+    </div>
+<{/if}>
+
+<{if $errormsg}>
+   <div class="alert alert-danger alert-dismissable">
+    <button type="button" class="close" data-dismiss="alert" aria-hidden="true">&times;</button>
+		<strong><{$errormsg}></strong>
+	</div>
+<{/if}>
+
+<{if $pagenav}>
+    <{$pagenav}>
+<{/if}>
+
+<form name="<{$pmform.name}>" id="<{$pmform.name}>" action="<{$pmform.action}>" method="<{$pmform.method}>" <{$pmform.extra}>>
+<div class="row xoops-message-list">
+<div class="xoops-message-header">
+    <div class="col-xs-1 col-md-1">
+        <input name="allbox" id="allbox" onclick='xoopsCheckAll("<{$pmform.name}>", "allbox");' type="checkbox" value="Check All">
+    </div>
+    <div class="col-xs-1 col-md-1">
+        <span class="glyphicon glyphicon-circle-arrow-down btn btn-primary"></span>
+    </div>
+
+<{if $op == "out"}>
+	<div class="col-xs-2 col-md-2"><strong><{$smarty.const._PM_TO}></strong></div>
+<{else}>
+	<div class="col-xs-2 col-md-2"><strong><{$smarty.const._PM_FROM}></strong></div>
+<{/if}>
+
+<div class="col-xs-4 col-md-4"><strong><{$smarty.const._PM_SUBJECT}></strong></div>
+
+<div class="col-xs-2 col-md-2"><strong><{$smarty.const._PM_DATE}></strong></div>
+
+</div><!-- .xoops-message-header -->
+
+<{if $total_messages == 0}>
+
+<div class="col-md-12">
+<div class="alert alert-warning">
+	<{$smarty.const._PM_YOUDONTHAVE}>
+</div>
+</div>
+<{/if}>
+</div><!-- .xoops-message-list -->
+
+<{foreach item=message from=$messages}>
+<div class="row xoops-message-list xoops-message-loop">
+    <div class="col-xs-1 col-md-1">
+        <input type="checkbox" id="msg_id_<{$message.msg_id}>" name='msg_id[]' value="<{$message.msg_id}>">
+    </div>
+<{if $message.read_msg == 1}>
+	<div class="col-xs-1 col-md-1">
+		<span class="glyphicon glyphicon-ok-sign btn btn-success"></span>
+	</div>
+<{else}>
+    <div class="col-xs-1 col-md-1">
+        <span class="glyphicon glyphicon-envelope btn btn-warning" title="<{$smarty.const._PM_NOTREAD}>"></span>
+    </div>
+<{/if}>
+
+<{if $message.msg_image != ""}>
+    <div class="col-xs-2 col-md-2">
+        <img src="<{$xoops_url}>/images/subject/<{$message.msg_image}>" alt="">
+    </div>
+<{/if}>
+<{if $message.postername != ""}>
+    <div class="col-xs-2 col-md-2">
+        <a href="<{$xoops_url}>/userinfo.php?uid=<{$message.posteruid}>" title=""><{$message.postername}></a>
+    </div>
+<{else}>
+	<div class="col-xs-2 col-md-2">
+		<{$anonymous}>
+	</div>
+<{/if}>
+
+<div class="col-xs-4 col-md-4">
+    <a href="readpmsg.php?msg_id=<{$message.msg_id}>&amp;start=<{$message.msg_no}>&amp;total_messages=<{$total_messages}>&amp;op=<{$op}>" title="">
+        <{$message.subject}>
+    </a>
+</div>
+
+<div class="col-xs-4 col-md-4">
+	<{$message.msg_time}>
+</div>
+</div><!-- .xoops-message-list -->
+<{/foreach}>
+
+<{$pmform.elements.send.body}>
+<{if $display}>
+    <{$pmform.elements.move_messages.body}>
+    <{$pmform.elements.delete_messages.body}>
+    <{$pmform.elements.empty_messages.body}>
+<{/if}>
+
+<{foreach item=element from=$pmform.elements}>
+    <{if $element.hidden == 1}>
+        <{$element.body}>
+    <{/if}>
+<{/foreach}>
+</form>
+
+<{if $pagenav}>
+	<{$pagenav}>
+<{/if}>
diff --git a/modules/profile/profile_userinfo.tpl b/modules/profile/profile_userinfo.tpl
@@ -0,0 +1,84 @@
+<{includeq file="db:profile_breadcrumbs.html"}>
+<div class="row">
+<div class="col-xs-6 col-md-6 aligncenter">
+<{if $avatar}>
+        <img src="<{$avatar}>" alt="<{$uname}>" class="img-responsive img-rounded img-thumbnail">
+<{/if}>
+    <div class="aligncenter">
+    <ul class="list-unstyled">
+        <li><span class="label label-info"><{$uname}></span></li>
+        <{if $email}>
+            <li><span class="label label-info"><{$email}></span></li>
+        <{/if}>
+	</ul>
+    </div><!-- .aligncenter -->
+</div><!-- .col-md-6 .aligncenter -->
+
+<div class="col-xs-6 col-md-6">
+<{if !$user_ownpage && $xoops_isuser == true}>
+    <form name="usernav" action="user.php" method="post">
+        <input class="btn btn-success" type="button" value="<{$smarty.const._PROFILE_MA_SENDPM}>" onclick="javascript:openWithSelfMain('<{$xoops_url}>/pmlite.php?send2=1&amp;to_userid=<{$user_uid}>', 'pmlite', 450, 380);">
+    </form>
+<{/if}>        
+
+<{if $user_ownpage == true}>
+
+    <form name="usernav" action="user.php" method="post">
+        <input class="btn btn-success btn-xs btn-block" type="button" value="<{$lang_editprofile}>" onclick="location='<{$xoops_url}>/modules/<{$xoops_dirname}>/edituser.php'">
+        <input class="btn btn-success btn-xs btn-block" type="button" value="<{$lang_changepassword}>" onclick="location='<{$xoops_url}>/modules/<{$xoops_dirname}>/changepass.php'">
+        <{if $user_changeemail}>
+		<input class="btn btn-success btn-xs btn-block" type="button" value="<{$smarty.const._PROFILE_MA_CHANGEMAIL}>" onclick="location='<{$xoops_url}>/modules/<{$xoops_dirname}>/changemail.php'">
+        <{/if}>
+
+        <{if $user_candelete == true}>
+        <form method="post" action="<{$xoops_url}>/modules/<{$xoops_dirname}>/user.php">
+            <input  type="hidden" name="op" value="delete">
+            <input type="hidden" name="uid" value="<{$user_uid}>">
+            <input class="btn btn-success btn-xs btn-block" type="button" value="<{$lang_deleteaccount}>" onclick="submit();">
+        </form>
+        <{/if}>
+
+        <input class="btn btn-success btn-xs btn-block" type="button" value="<{$lang_avatar}>" onclick="location='edituser.php?op=avatarform'">
+        <input class="btn btn-success btn-xs btn-block" type="button" value="<{$lang_inbox}>" onclick="location='<{$xoops_url}>/viewpmsg.php'">
+        <input class="btn btn-success btn-xs btn-block" type="button" value="<{$lang_logout}>" onclick="location='<{$xoops_url}>/modules/<{$xoops_dirname}>/user.php?op=logout'">
+    </form>
+
+<{elseif $xoops_isadmin != false}>
+    <form method="post" action="<{$xoops_url}>/modules/<{$xoops_dirname}>/admin/deactivate.php">
+        <input class="btn btn-info btn-xs btn-block" type="button" value="<{$lang_editprofile}>" onclick="location='<{$xoops_url}>/modules/<{$xoops_dirname}>/admin/user.php?op=edit&amp;id=<{$user_uid}>'">
+        <input type="hidden" name="uid" value="<{$user_uid}>">
+        <{if $userlevel == 1}>
+            <input type="hidden" name="level" value="0">
+            <input class="btn btn-info btn-xs btn-block" type="button" value="<{$smarty.const._PROFILE_MA_DEACTIVATE}>" onclick="submit();">
+        <{else}>
+            <input type="hidden" name="level" value="1">
+            <input class="btn btn-info btn-xs btn-block" type="button" value="<{$smarty.const._PROFILE_MA_ACTIVATE}>" onclick="submit();">
+    <{/if}>
+    </form>
+<{/if}>
+</div><!-- .col-md-6 -->
+</div><!-- .row -->
+
+<{foreach item=category from=$categories}>
+    <{if isset($category.fields)}>
+        <ul id="profile-category-<{$category.cat_id}>" class="profile-values list-unstyled">
+            <li class="profile-category-title"><{$category.cat_title}></li>
+                <{foreach item=field from=$category.fields}>
+                    <li><strong><{$field.title}>:</strong> <{$field.value}></li>
+                <{/foreach}>
+        </ul>
+    <{/if}>
+<{/foreach}>
+
+<{if $modules}>
+<ul class="profile-values list-unstyled">
+<li class="profile-category-title"><{$recent_activity}></li>
+    <{foreach item=module from=$modules}>
+        <li><strong><{$module.name}></strong></li>
+            <{foreach item=result from=$module.results}>
+                <li><img src="<{$result.image}>" alt="<{$module.name}>"> <a href="<{$result.link}>"><{$result.title}></a> (<{$result.time}>)</li>
+            <{/foreach}>
+        <{$module.showall_link}>
+    <{/foreach}>
+</ul>
+<{/if}>
diff --git a/style.css b/style.css
@@ -374,4 +374,4 @@ div.order-by a{color:#999; font-size:1.2em;}
 /* bla, bla, bla */
 .aligncenter{text-align:center; margin-left:auto; margin-right:auto;}
 .alignleft{text-align:left; float:left;}
-.alignright{text-align:right; float:right;}
+.alignright{text-align:right; float:right;}
diff --git a/theme.html b/theme.html
@@ -26,8 +26,8 @@
 <script src="<{xoImgUrl}>js/masonry.pkgd.min.js"></script>
 <script src="<{xoImgUrl}>js/imagesloaded.pkgd.min.js"></script>
 <!--[if lt IE 9]>
-    <script src="https://oss.maxcdn.com/libs/html5shiv/3.7.0/html5shiv.js"></script>
-    <script src="https://oss.maxcdn.com/libs/respond.js/1.3.0/respond.min.js"></script>
+    <script src="http://oss.maxcdn.com/libs/html5shiv/3.7.0/html5shiv.js"></script>
+    <script src="http://oss.maxcdn.com/libs/respond.js/1.3.0/respond.min.js"></script>
     <script src="<{xoImgUrl}>js/selectivizr-min.js"></script>
 <![endif]-->
 <script src="<{xoImgUrl}>js/js.js"></script>