Menu
▾
▴
[xoops-svn] SF.net SVN: xoops:[10138] XoopsModules/newbb/branches/irmtfan/newbb
|
From: <ir...@us...> - 2012-09-01 08:47:14
|
Revision: 10138
http://xoops.svn.sourceforge.net/xoops/?rev=10138&view=rev
Author: irmtfan
Date: 2012-09-01 08:47:07 +0000 (Sat, 01 Sep 2012)
Log Message:
-----------
add toggle $quickreply['expand'], change button to span, add icon.id and innerHTML, remove persian gif images
Modified Paths:
--------------
XoopsModules/newbb/branches/irmtfan/newbb/changelog-rev10109.txt
XoopsModules/newbb/branches/irmtfan/newbb/class/icon.php
XoopsModules/newbb/branches/irmtfan/newbb/include/display.php
XoopsModules/newbb/branches/irmtfan/newbb/include/js/newbb_toggle.js
XoopsModules/newbb/branches/irmtfan/newbb/templates/images/language/english/style.css
XoopsModules/newbb/branches/irmtfan/newbb/templates/images/language/persian/style.css
XoopsModules/newbb/branches/irmtfan/newbb/viewtopic.php
Removed Paths:
-------------
XoopsModules/newbb/branches/irmtfan/newbb/templates/images/language/persian/new_forum.gif
XoopsModules/newbb/branches/irmtfan/newbb/templates/images/language/persian/new_subforum.gif
XoopsModules/newbb/branches/irmtfan/newbb/templates/images/language/persian/offline.gif
XoopsModules/newbb/branches/irmtfan/newbb/templates/images/language/persian/online-a.gif
XoopsModules/newbb/branches/irmtfan/newbb/templates/images/language/persian/p_delete-a.gif
XoopsModules/newbb/branches/irmtfan/newbb/templates/images/language/persian/p_edit-a.gif
XoopsModules/newbb/branches/irmtfan/newbb/templates/images/language/persian/p_quote-a.gif
XoopsModules/newbb/branches/irmtfan/newbb/templates/images/language/persian/p_reply-a.gif
XoopsModules/newbb/branches/irmtfan/newbb/templates/images/language/persian/p_report-a.gif
XoopsModules/newbb/branches/irmtfan/newbb/templates/images/language/persian/p_up-a.gif
XoopsModules/newbb/branches/irmtfan/newbb/templates/images/language/persian/t_new-a.gif
XoopsModules/newbb/branches/irmtfan/newbb/templates/images/language/persian/t_poll-a.gif
XoopsModules/newbb/branches/irmtfan/newbb/templates/images/language/persian/t_qr-a.gif
XoopsModules/newbb/branches/irmtfan/newbb/templates/images/language/persian/t_reply-a.gif
Modified: XoopsModules/newbb/branches/irmtfan/newbb/changelog-rev10109.txt
===================================================================
--- XoopsModules/newbb/branches/irmtfan/newbb/changelog-rev10109.txt 2012-09-01 06:27:16 UTC (rev 10137)
+++ XoopsModules/newbb/branches/irmtfan/newbb/changelog-rev10109.txt 2012-09-01 08:47:07 UTC (rev 10138)
@@ -1,3 +1,17 @@
+date 2012-09-01
+================================================
+1- add toggle $quickreply['expand'] to find quickreply hide/see
+newbb/viewtopic.php
+
+2- add alt and title to text links - change <button> html tag to <span> class="forum_icon forum_button" to support IE7&8
+newbb/class/icon.php, newbb/templates/images/language/english/style.css, newbb/include/display.php (juct change help comments)
+
+3- improve ToggleBlockCategory js to change icon.id and use innerHTML instead of textContent to support IE7&8
+newbb/include/js/newbb_toggle.js
+
+4- remove unneeded gif persian images
+newbb/templates/images/language/persian
+
date 2012-08-30
================================================
1- add more and less icons - add t_qr_expand.png image and add show see definitions
Modified: XoopsModules/newbb/branches/irmtfan/newbb/class/icon.php
===================================================================
--- XoopsModules/newbb/branches/irmtfan/newbb/class/icon.php 2012-09-01 06:27:16 UTC (rev 10137)
+++ XoopsModules/newbb/branches/irmtfan/newbb/class/icon.php 2012-09-01 08:47:07 UTC (rev 10138)
@@ -151,12 +151,12 @@
function assignImage($image, $alt = "", $extra = "")
{
$this->setImage($image, $alt, $extra);
- // START hacked by irmtfan - improve function to CSS3 buttons
+ // START hacked by irmtfan - improve function to CSS3 buttons - add alt and title attributes - use span instead of button to support IE7&8
$tag="span";
- if (in_array( substr($image,0,2),array('t_','p_','up') )) {
- $tag="button";
+ if (in_array( substr($image,0,2),array('t_','p_','up') ) && $extra === "class='forum_icon'") {
+ $extra ="class='forum_icon forum_button'";
}
- return "<{$tag} align=\"middle\" {$extra} id={$image}>$alt</{$tag}>";
+ return "<{$tag} alt=\"{$alt}\" title=\"{$alt}\" align=\"middle\" {$extra} id={$image}>$alt</{$tag}>";
// END hacked by irmtfan - improve function to CSS3 buttons
}
Modified: XoopsModules/newbb/branches/irmtfan/newbb/include/display.php
===================================================================
--- XoopsModules/newbb/branches/irmtfan/newbb/include/display.php 2012-09-01 06:27:16 UTC (rev 10137)
+++ XoopsModules/newbb/branches/irmtfan/newbb/include/display.php 2012-09-01 08:47:07 UTC (rev 10138)
@@ -32,14 +32,14 @@
eg:
For buttons:
all buttons:
- button.forum_icon
- button.forum_icon:hover
- button.forum_icon:active
+ span.forum_icon.forum_button
+ span.forum_icon.forum_button:hover
+ span.forum_icon.forum_button:active
each button (p_edit):
- button.forum_icon#p_edit
- button.forum_icon#p_edit:hover
- button.forum_icon#p_edit:active
+ span.forum_icon.forum_button#p_edit
+ span.forum_icon.forum_button#p_edit:hover
+ span.forum_icon.forum_button#p_edit:active
For other images:
all images:
Modified: XoopsModules/newbb/branches/irmtfan/newbb/include/js/newbb_toggle.js
===================================================================
--- XoopsModules/newbb/branches/irmtfan/newbb/include/js/newbb_toggle.js 2012-09-01 06:27:16 UTC (rev 10137)
+++ XoopsModules/newbb/branches/irmtfan/newbb/include/js/newbb_toggle.js 2012-09-01 08:47:07 UTC (rev 10138)
@@ -61,7 +61,7 @@
}
}
}
-
+// START irmtfan - improve: add alt, title, id and innerHTML - recognize a IMG tag for src
function ToggleBlockCategory(block, icon, src_expand, src_collapse, alt_expand, alt_collapse)
{
var Img_tag='IMG';
@@ -74,6 +74,7 @@
icon.src = src_collapse;
}
icon.alt= alt_collapse;
+ icon.id = findBaseName(src_collapse);
SaveCollapsed(block, true);
}
else
@@ -83,6 +84,7 @@
icon.src = src_expand;
}
icon.alt= alt_expand;
+ icon.id = findBaseName(src_expand);
SaveCollapsed(block, false);
}
}
@@ -95,6 +97,7 @@
icon.src = src_collapse;
}
icon.alt= alt_collapse;
+ icon.id = findBaseName(src_collapse);
SaveCollapsed(block, true);
}
else
@@ -104,14 +107,21 @@
icon.src = src_expand;
}
icon.alt= alt_expand;
+ icon.id = findBaseName(src_expand);
SaveCollapsed(block, false);
}
}
icon.title = icon.alt;
- icon.textContent=icon.title;
+ icon.innerHTML=icon.alt; // to support IE7&8 use innerHTML istead of textContent
}
+// source: http://stackoverflow.com/questions/1991608/find-base-name-in-url-in-javascript
+function findBaseName(url) {
+ var fileName = url.substring(url.lastIndexOf('/') + 1);
+ var dot = fileName.lastIndexOf('.');
+ return dot == -1 ? fileName : fileName.substring(0, dot);
+}
+// END irmtfan - improve: add alt, title and innerHTML - recognize a IMG tag for src
-
function SaveCollapsed(objid, addcollapsed)
{
var collapsed = GetCookie(toggle_cookie);
@@ -174,4 +184,4 @@
}
}
return null;
-}
+}
\ No newline at end of file
Modified: XoopsModules/newbb/branches/irmtfan/newbb/templates/images/language/english/style.css
===================================================================
--- XoopsModules/newbb/branches/irmtfan/newbb/templates/images/language/english/style.css 2012-09-01 06:27:16 UTC (rev 10137)
+++ XoopsModules/newbb/branches/irmtfan/newbb/templates/images/language/english/style.css 2012-09-01 08:47:07 UTC (rev 10138)
@@ -325,12 +325,12 @@
}
/* irmtfan source: http://jsfiddle.net/VTLmj/
you can customize each button like this:
-button.forum_icon#p_edit
-button.forum_icon#p_edit:hover
-button.forum_icon#p_edit:active
+span.forum_icon.forum_button#p_edit
+span.forum_icon.forum_button#p_edit:hover
+span.forum_icon.forum_button#p_edit:active
find all image names in newbb/include/images.php
*/
-button.forum_icon {
+span.forum_icon.forum_button {
background: #407DC7;
background-image: -webkit-gradient(linear, 0% 0%, 0% 100%, from(#407DC7), to(#4279B8));
background-image: -webkit-linear-gradient(top, #407DC7, #4279B8);
@@ -345,16 +345,14 @@
border-style: solid;
border-radius: 5px;
box-shadow: 0 1px 7px #080808;
-font-family: Tahoma;
+font-weight: bold;
}
-button.forum_icon:hover {
+span.forum_icon.forum_button:hover {
box-shadow: 0 1px 5px #222;
}
-
-button.forum_icon:active {
+span.forum_icon.forum_button:active {
box-shadow: inset 0 1px 7px #565656;
-border-width: 1px;
border-color: white #a1c1e6 black #a1c1e6;
-border-style: solid;
+font-weight: normal;
}
/* color - end */
\ No newline at end of file
Deleted: XoopsModules/newbb/branches/irmtfan/newbb/templates/images/language/persian/new_forum.gif
===================================================================
(Binary files differ)
Deleted: XoopsModules/newbb/branches/irmtfan/newbb/templates/images/language/persian/new_subforum.gif
===================================================================
(Binary files differ)
Deleted: XoopsModules/newbb/branches/irmtfan/newbb/templates/images/language/persian/offline.gif
===================================================================
(Binary files differ)
Deleted: XoopsModules/newbb/branches/irmtfan/newbb/templates/images/language/persian/online-a.gif
===================================================================
(Binary files differ)
Deleted: XoopsModules/newbb/branches/irmtfan/newbb/templates/images/language/persian/p_delete-a.gif
===================================================================
(Binary files differ)
Deleted: XoopsModules/newbb/branches/irmtfan/newbb/templates/images/language/persian/p_edit-a.gif
===================================================================
(Binary files differ)
Deleted: XoopsModules/newbb/branches/irmtfan/newbb/templates/images/language/persian/p_quote-a.gif
===================================================================
(Binary files differ)
Deleted: XoopsModules/newbb/branches/irmtfan/newbb/templates/images/language/persian/p_reply-a.gif
===================================================================
(Binary files differ)
Deleted: XoopsModules/newbb/branches/irmtfan/newbb/templates/images/language/persian/p_report-a.gif
===================================================================
(Binary files differ)
Deleted: XoopsModules/newbb/branches/irmtfan/newbb/templates/images/language/persian/p_up-a.gif
===================================================================
(Binary files differ)
Modified: XoopsModules/newbb/branches/irmtfan/newbb/templates/images/language/persian/style.css
===================================================================
--- XoopsModules/newbb/branches/irmtfan/newbb/templates/images/language/persian/style.css 2012-09-01 06:27:16 UTC (rev 10137)
+++ XoopsModules/newbb/branches/irmtfan/newbb/templates/images/language/persian/style.css 2012-09-01 08:47:07 UTC (rev 10138)
@@ -328,12 +328,12 @@
}
/* irmtfan source: http://jsfiddle.net/VTLmj/
you can customize each button like this:
-button.forum_icon#p_edit
-button.forum_icon#p_edit:hover
-button.forum_icon#p_edit:active
+span.forum_icon.forum_button#p_edit
+span.forum_icon.forum_button#p_edit:hover
+span.forum_icon.forum_button#p_edit:active
find all image names in newbb/include/images.php
*/
-button.forum_icon {
+span.forum_icon.forum_button {
background: #407DC7;
background-image: -webkit-gradient(linear, 0% 0%, 0% 100%, from(#407DC7), to(#4279B8));
background-image: -webkit-linear-gradient(top, #407DC7, #4279B8);
@@ -348,16 +348,14 @@
border-style: solid;
border-radius: 5px;
box-shadow: 0 1px 7px #080808;
-font-family: Tahoma;
+font-weight: bold;
}
-button.forum_icon:hover {
+span.forum_icon.forum_button:hover {
box-shadow: 0 1px 5px #222;
}
-
-button.forum_icon:active {
+span.forum_icon.forum_button:active {
box-shadow: inset 0 1px 7px #565656;
-border-width: 1px;
border-color: white #a1c1e6 black #a1c1e6;
-border-style: solid;
+font-weight: normal;
}
/* color - end */
\ No newline at end of file
Deleted: XoopsModules/newbb/branches/irmtfan/newbb/templates/images/language/persian/t_new-a.gif
===================================================================
(Binary files differ)
Deleted: XoopsModules/newbb/branches/irmtfan/newbb/templates/images/language/persian/t_poll-a.gif
===================================================================
(Binary files differ)
Deleted: XoopsModules/newbb/branches/irmtfan/newbb/templates/images/language/persian/t_qr-a.gif
===================================================================
(Binary files differ)
Deleted: XoopsModules/newbb/branches/irmtfan/newbb/templates/images/language/persian/t_reply-a.gif
===================================================================
(Binary files differ)
Modified: XoopsModules/newbb/branches/irmtfan/newbb/viewtopic.php
===================================================================
--- XoopsModules/newbb/branches/irmtfan/newbb/viewtopic.php 2012-09-01 06:27:16 UTC (rev 10137)
+++ XoopsModules/newbb/branches/irmtfan/newbb/viewtopic.php 2012-09-01 08:47:07 UTC (rev 10138)
@@ -643,18 +643,26 @@
$forum_form->addElement($submit_button);
$toggles = newbb_getcookie('G', true);
- // START irmtfan improve quickreply smarty variable - add alt key to quick reply button - change $display to $style for more comprehension
+ // START irmtfan improve quickreply smarty variable - add alt key to quick reply button - change $display to $style for more comprehension - add toggle $quickreply['expand']
$quickreply= array();
$qr_collapse = "t_qr";
$qr_expand = "t_qr_expand"; // change this
- $quickreply['show']= 1; // could be improved to default = hide = 2 in the future
- $quickreply['style'] = (in_array('qr', $toggles)) ? 'none;' : 'block;';
$quickreply['icon'] = array(
"expand" => $icon_handler->getImageSource($qr_expand),
"collapse" => $icon_handler->getImageSource($qr_collapse))
;
- // $quickreply['show'] =1 =>
- $quickreply['displayImage'] = newbb_displayImage($qr_expand,_MD_NEWBB_HIDE.' '._MD_QUICKREPLY);
+ $quickreply['show'] = 1; // = !empty($xoopsModuleConfig['quickreply_enabled']
+ $quickreply['expand'] = (count($toggles) > 0) ? ( (in_array('qr', $toggles)) ? false : true ) : true;
+ if ($quickreply['expand']) {
+ $quickreply['style'] = 'block;';
+ $quickreply_icon_display = $qr_expand;
+ $quickreply_alt = _MD_NEWBB_HIDE.' '._MD_QUICKREPLY;
+ } else {
+ $quickreply['style'] = 'none;';
+ $quickreply_icon_display = $qr_collapse;
+ $quickreply_alt = _MD_NEWBB_SEE.' '._MD_QUICKREPLY;
+ }
+ $quickreply['displayImage'] = newbb_displayImage($quickreply_icon_display, $quickreply_alt);
$quickreply['form'] = $forum_form->render();
$xoopsTpl->assign('quickreply', $quickreply);
// END irmtfan improve quickreply smarty variable
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
