Merge pull request #21 from mambax7/master

1.53 RC 1
XoopsModules25x · Aug 10, 2021 · ba0685d · ba0685d
2 parents ca7b61d + 7d18ace
commit ba0685d
Show file tree

Hide file tree

Showing 41 changed files with 124 additions and 139 deletions.
diff --git a/EXTRA/themes/xbootstrap/modules/lexikon/lx_authorlist.tpl b/EXTRA/themes/xbootstrap/modules/lexikon/lx_authorlist.tpl
@@ -1,9 +1,9 @@
 <table id="moduleheader">
     <tr>
         <td width="100%"><span class="leftheader"><a href="<{$xoops_url}>"><{$smarty.const._MD_LEXIKON_HOME}></a> <img
-                        src='assets/images/arrow.gif' align='absmiddle'/> <a
+                        src='assets/images/arrow.gif' align='absmiddle'> <a
                         href="<{$xoops_url}>/modules/<{$lang_moduledirname}>/index.php"><{$lang_modulename}></a> <img
-                        src='assets/images/arrow.gif' align='absmiddle'/> <a
+                        src='assets/images/arrow.gif' align='absmiddle'> <a
                         href="<{$xoops_url}>/modules/<{$lang_moduledirname}>/authorlist.php"><{$smarty.const._MD_LEXIKON_CONTRIBUTORS}></a></span>
         </td>
         </span></td>

diff --git a/EXTRA/themes/xbootstrap/modules/lexikon/lx_bookmark.tpl b/EXTRA/themes/xbootstrap/modules/lexikon/lx_bookmark.tpl
@@ -1,97 +1,97 @@
 <!-- Bookmarks -->
 <div class="socbookmark" align="center" style="clear: both; margin:0 1.0em 0 0;">
-    <!--// <a target="_blank" title="<{$smarty.const._MD_LEXIKON_BKMK_TO_DIIGO}>" href="http://www.furl.net/storeIt.jsp?t=<{$encoded_title|default:''}>&u=<{$xoops_url}>/modules/<{$lang_moduledirname}>/entry.php?entryID=<{$thisterm.id}>" Target="_new"><img border="0" alt="<{$smarty.const._MD_LEXIKON_BKMK_TO_DIIGO}>" src="<{$xoops_url}>/modules/<{$lang_moduledirname}>/assets/images/bookmark/diigo.gif" width="18" height="18" /></a>&nbsp;
+    <!--// <a target="_blank" title="<{$smarty.const._MD_LEXIKON_BKMK_TO_DIIGO}>" href="http://www.furl.net/storeIt.jsp?t=<{$encoded_title|default:''}>&u=<{$xoops_url}>/modules/<{$lang_moduledirname}>/entry.php?entryID=<{$thisterm.id}>" Target="_new"><img border="0" alt="<{$smarty.const._MD_LEXIKON_BKMK_TO_DIIGO}>" src="<{$xoops_url}>/modules/<{$lang_moduledirname}>/assets/images/bookmark/diigo.gif" width="18" height="18"></a>&nbsp;
      -->
     <a target="_blank" title="<{$smarty.const._MD_LEXIKON_BKMK_TO_FARK}>"
        href="http://www.fark.com/cgi/farkit.pl?h=<{$xoops_url}>/modules/<{$lang_moduledirname}>/entry.php?entryID=<{$thisterm.id}>&title=<{$encoded_title|default:''}>"
        Target="_new"><img border="0"
                           alt="<{$smarty.const._MD_LEXIKON_BKMK_TO_FARK}>"
                           src="<{$xoops_url}>/modules/<{$lang_moduledirname}>/assets/images/bookmark/fark.png"
-                          width="18" height="18"/></a>&nbsp;
+                          width="18" height="18"></a>&nbsp;
     <a target="_blank" title="<{$smarty.const._MD_LEXIKON_BKMK_TO_REDDIT}>"
        href="http://reddit.com/submit?url=<{$xoops_url}>/modules/<{$lang_moduledirname}>/entry.php?entryID=<{$thisterm.id}>&title=<{$encoded_title|default:''}>"
        Target="_new"><img border="0"
                           alt="<{$smarty.const._MD_LEXIKON_BKMK_TO_REDDIT}>"
                           src="<{$xoops_url}>/modules/<{$lang_moduledirname}>/assets/images/bookmark/reddit.png"
-                          width="18" height="18"/></a>&nbsp;
+                          width="18" height="18"></a>&nbsp;
     <a target="_blank" title="<{$smarty.const._MD_LEXIKON_BKMK_TO_BLINKLIST}>"
        href="http://www.blinklist.com/index.php?Action=Blink/addblink.php&Description=&Url=<{$xoops_url}>/modules/<{$lang_moduledirname}>/entry.php?entryID=<{$thisterm.id}>&Title=<{$encoded_title|default:''}>"
        Target="_new"><img border="0" alt="<{$smarty.const._MD_LEXIKON_BKMK_TO_BLINKLIST}>"
                           src="<{$xoops_url}>/modules/<{$lang_moduledirname}>/assets/images/bookmark/blinklist.png"
                           width="18"
-                          height="18"/></a>&nbsp;
+                          height="18"></a>&nbsp;
     <a target="_blank" title="<{$smarty.const._MD_LEXIKON_BKMK_TO_TECHNORATI}>"
        href="http://www.technorati.com/faves?add=<{$xoops_url}>/modules/<{$lang_moduledirname}>/entry.php?entryID=<{$thisterm.id}>&title=<{$encoded_title|default:''}>"
        Target="_new"><img border="0"
                           alt="<{$smarty.const._MD_LEXIKON_BKMK_TO_TECHNORATI}>"
                           src="<{$xoops_url}>/modules/<{$lang_moduledirname}>/assets/images/bookmark/technorati.png"
-                          width="18" height="18"/></a>&nbsp;
+                          width="18" height="18"></a>&nbsp;
     <a target="_blank" title="<{$smarty.const._MD_LEXIKON_BKMK_TO_NEWSVINE}>"
        href="http://www.newsvine.com/_tools/seed&save?u=<{$xoops_url}>/modules/<{$lang_moduledirname}>/entry.php?entryID=<{$thisterm.id}>&h=<{$encoded_title|default:''}>"
        Target="_new"><img border="0"
                           alt="<{$smarty.const._MD_LEXIKON_BKMK_TO_NEWSVINE}>"
                           src="<{$xoops_url}>/modules/<{$lang_moduledirname}>/assets/images/bookmark/newsvine.gif"
                           width="18"
-                          height="18"/></a>&nbsp;
+                          height="18"></a>&nbsp;
     <a target="_blank" title="<{$smarty.const._MD_LEXIKON_BKMK_TO_MISTERWONG}>"
        href="http://www.mister-wong.de/index.php?action=addurl&amp;bm_url=<{$xoops_url}>/modules/<{$lang_moduledirname}>/entry.php?entryID=<{$thisterm.id}>&amp;bm_description=<{$encoded_title|default:''}>"
        Target="_new"><img border="0" alt="<{$smarty.const._MD_LEXIKON_BKMK_TO_MISTERWONG}>"
                           src="<{$xoops_url}>/modules/<{$lang_moduledirname}>/assets/images/bookmark/mrwong.gif"
                           width="18"
-                          height="18"/></a>&nbsp;
+                          height="18"></a>&nbsp;
     <a target="_blank" title="<{$smarty.const._MD_LEXIKON_BKMK_TO_DELICIOUS}>"
        href="http://del.icio.us/post?url=<{$xoops_url}>/modules/<{$lang_moduledirname}>/entry.php?entryID=<{$thisterm.id}>&title=<{$encoded_title|default:''}>"
        Target="_new"><img border="0"
                           alt="<{$smarty.const._MD_LEXIKON_BKMK_TO_DELICIOUS}>"
                           src="<{$xoops_url}>/modules/<{$lang_moduledirname}>/assets/images/bookmark/delicious.gif"
-                          width="18" height="18"/></a>&nbsp;
+                          width="18" height="18"></a>&nbsp;
     <a target="_blank" title="<{$smarty.const._MD_LEXIKON_BKMK_TO_DIGG}>"
        href="http://digg.com/submit?phase=2&url=<{$xoops_url}>/modules/<{$lang_moduledirname}>/entry.php?entryID=<{$thisterm.id}>"
        Target="_new"><img border="0" alt="<{$smarty.const._MD_LEXIKON_BKMK_TO_DIGG}>"
                           src="<{$xoops_url}>/modules/<{$lang_moduledirname}>/assets/images/bookmark/digg.gif"
-                          width="18" height="18"/></a>&nbsp;
+                          width="18" height="18"></a>&nbsp;
     <a target="_blank" title="<{$smarty.const._MD_LEXIKON_BKMK_TO_GOOGLE}>"
        href="http://www.google.com/bookmarks/mark?op=add&hl=de&bkmk=<{$xoops_url}>/modules/<{$lang_moduledirname}>/entry.php?entryID=<{$thisterm.id}>+&title=<{$encoded_title|default:''}>"
        Target="_new"><img
                 border="0" alt="<{$smarty.const._MD_LEXIKON_BKMK_TO_GOOGLE}>"
                 src="<{$xoops_url}>/modules/<{$lang_moduledirname}>/assets/images/bookmark/google_bookmarks.gif"
-                width="18" height="18"/></a>&nbsp;
+                width="18" height="18"></a>&nbsp;
     <a target="_blank" title="<{$smarty.const._MD_LEXIKON_BKMK_TO_FACEBOOK}>"
        href="http://de.facebook.com/sharer.php?u=<{$xoops_url}>/modules/<{$lang_moduledirname}>/entry.php?entryID=<{$thisterm.id}>&t=<{$encoded_title|default:''}>"
        Target="_new"><img border="0"
                           alt="<{$smarty.const._MD_LEXIKON_BKMK_TO_FACEBOOK}>"
                           src="<{$xoops_url}>/modules/<{$lang_moduledirname}>/assets/images/bookmark/facebook.gif"
-                          width="18" height="18"/></a>&nbsp;
+                          width="18" height="18"></a>&nbsp;
     <a target="_blank" title="<{$smarty.const._MD_LEXIKON_BKMK_TO_TWITTER}>"
        href="http://twitter.com/intent/tweet?url=<{$xoops_url}>/modules/<{$lang_moduledirname}>/entry.php?entryID=<{$thisterm.id}>&text=<{$encoded_title|default:''}>"
        Target="_new"><img border="0"
                           alt="<{$smarty.const._MD_LEXIKON_BKMK_TO_TWITTER}>"
                           src="<{$xoops_url}>/modules/<{$lang_moduledirname}>/assets/images/bookmark/twitter.gif"
-                          width="18" height="18"/></a>&nbsp;
+                          width="18" height="18"></a>&nbsp;
     <a target="_blank" title="<{$smarty.const._MD_LEXIKON_BKMK_TO_LINKARENA}>"
        href="http://linkarena.com/bookmarks/addlink/?url=<{$xoops_url}>/modules/<{$lang_moduledirname}>/entry.php?entryID=<{$thisterm.id}>&title=<{$encoded_title|default:''}>&tags=<{$encoded_title|default:''}>"
        Target="_new"><img border="0" alt="<{$smarty.const._MD_LEXIKON_BKMK_TO_LINKARENA}>"
                           src="<{$xoops_url}>/modules/<{$lang_moduledirname}>/assets/images/bookmark/linkarena.gif"
                           width="18"
-                          height="18"/></a>&nbsp;
+                          height="18"></a>&nbsp;
     <a target="_blank" title="<{$smarty.const._MD_LEXIKON_BKMK_TO_ONEVIEW}>"
        href="http://www.oneview.de/add/?URL=<{$xoops_url}>/modules/<{$lang_moduledirname}>/entry.php?entryID=<{$thisterm.id}>&title=<{$encoded_title|default:''}>"
        Target="_new"><img border="0"
                           alt="<{$smarty.const._MD_LEXIKON_BKMK_TO_ONEVIEW}>"
                           src="<{$xoops_url}>/modules/<{$lang_moduledirname}>/assets/images/bookmark/oneview.gif"
-                          width="18" height="18"/></a>&nbsp;
+                          width="18" height="18"></a>&nbsp;
     <a target="_blank" title="<{$smarty.const._MD_LEXIKON_BKMK_TO_STUMBLEUPON}>"
        href="http://www.stumbleupon.com/submit?url=<{$xoops_url}>/modules/<{$lang_moduledirname}>/entry.php?entryID=<{$thisterm.id}>&title=<{$encoded_title|default:''}>"
        Target="_new"><img border="0"
                           alt="<{$smarty.const._MD_LEXIKON_BKMK_TO_STUMBLEUPON}>"
                           src="<{$xoops_url}>/modules/<{$lang_moduledirname}>/assets/images/bookmark/stumbleupon.gif"
                           width="18"
-                          height="18"/></a>&nbsp;<a
+                          height="18"></a>&nbsp;<a
             target="_blank" title="<{$smarty.const._MD_LEXIKON_BKMK_TO_STUDIVZ}>"
             href="http://www.studivz.net/Suggest/Selection/?u=<{$xoops_url}>/modules/<{$lang_moduledirname}>/entry.php?entryID=<{$thisterm.id}>&desc=<{$encoded_title|default:''}>"
             Target="_new"><img border="0"
                                alt="<{$smarty.const._MD_LEXIKON_BKMK_TO_STUDIVZ}>"
                                src="<{$xoops_url}>/modules/<{$lang_moduledirname}>/assets/images/bookmark/studivz.png"
                                width="18"
-                               height="18"/></a>
+                               height="18"></a>
 </div><br>
diff --git a/EXTRA/themes/xbootstrap/modules/lexikon/lx_category.tpl b/EXTRA/themes/xbootstrap/modules/lexikon/lx_category.tpl
@@ -70,7 +70,7 @@
                         <a href="<{$xoops_url}>/modules/<{$lang_moduledirname}>/category.php?categoryID=<{$catlinks.id}>" target="_parent">
                             <img src="<{$xoops_url}>/uploads/<{$lang_moduledirname}>/categories/images/<{$catlinks.image}>" 
                                 width="<{$logo_maximgwidth}>" align="left" class="floatLeft"
-                                alt="[<{$catlinks.name}>]&nbsp;[<{$catlinks.total}>]"/>
+                                alt="[<{$catlinks.name}>]&nbsp;[<{$catlinks.total}>]">
                          </a>
                      <{/if}>
                      <{if $catlinks.count|default:0 > 0}>
@@ -111,7 +111,7 @@
                         <a href="<{$xoops_url}>/modules/<{$lang_moduledirname}>/category.php?categoryID=<{$catlinks.id}>" target="_parent">
                             <img src="<{$xoops_url}>/uploads/<{$lang_moduledirname}>/categories/images/<{$catlinks.image}>" 
                                 width="<{$logo_maximgwidth}>" align="left" class="floatLeft"
-                                alt="[<{$catlinks.name}>]&nbsp;[<{$catlinks.total}>]"/>
+                                alt="[<{$catlinks.name}>]&nbsp;[<{$catlinks.total}>]">
                          </a>
                      <{/if}>
                      <{if $catlinks.count|default:0 > 0}>
@@ -164,7 +164,7 @@
                        <a href="<{$xoops_url}>/modules/<{$lang_moduledirname}>/category.php?categoryID=<{$eachcat.id}>" target="_parent">
                         <img src="<{$xoops_url}>/uploads/lexikon/categories/images/<{$eachcat.image}>"
                                  width="<{$imgcatwd}>" align="bottom" vspace="2" hspace="2" border="0"
-                                 alt="[<{$eachcat.name}>]"/>
+                                 alt="[<{$eachcat.name}>]">
                        </a>
                      <{/if}>
                     <{$eachcat.description}>
@@ -181,17 +181,17 @@
     </div>
 
     <{* syndication *}>
-    <{if $syndication == true}>
+    <{if $syndication === true}>
         <div align="center" style="padding: 4px;"><br><br>
-            <a href="rss.php" title="recent entries"><img src="assets/images/rss.gif" border="0"/></a>
+            <a href="rss.php" title="recent entries"><img src="assets/images/rss.gif" border="0"></a>
         </div>
     <{/if}>
 
 <{elseif $pagetype|default:'' == '1'}>
     <h3><{$singlecat.name}></h3>
     <p>
         <{if $singlecat.image|default:'' != "" && $show_screenshot|default:'' == '1'}>
-            <img src="<{$xoops_url}>/uploads/lexikon/categories/images/<{$singlecat.image}>" width="<{$imgcatwd}>" align="center" vspace="2" hspace="2" border="0" alt="[<{$singlecat.name}>]"/>
+            <img src="<{$xoops_url}>/uploads/lexikon/categories/images/<{$singlecat.image}>" width="<{$imgcatwd}>" align="center" vspace="2" hspace="2" border="0" alt="[<{$singlecat.name}>]">
                 <{$singlecat.name}>
         <{/if}>
         <{$singlecat.description}>
@@ -224,10 +224,10 @@
 </div>
 
         <{* syndication *}>
-        <{if $syndication == true}>
+        <{if $syndication === true}>
             <div align="center" style="padding: 4px;"><br><br>
                 <a href="rss.php?categoryID=<{$singlecat.id}>" title="Recent terms in this category"><img
-                            src="assets/images/rss.gif" border="0"/></a>
+                            src="assets/images/rss.gif" border="0"></a>
             </div>
         <{/if}>
 

diff --git a/EXTRA/themes/xbootstrap/modules/lexikon/lx_content.tpl b/EXTRA/themes/xbootstrap/modules/lexikon/lx_content.tpl
@@ -31,14 +31,14 @@
     <form name="<{$yform.name}>" action="" method="<{$yform.method}>" <{$yform.extra}> >
         <label><{$yform.elements.txt.caption}></td></label>
         <{$yform.elements.txt.body}>
-        <input type=button value="select" style="margin-top: 5px" class="btn btn-success btn-sm" onClick="this.form.txt.focus();this.form.txt.select(); document.execCommand('Copy')" />
+        <input type=button value="select" style="margin-top: 5px" class="btn btn-success btn-sm" onClick="this.form.txt.focus();this.form.txt.select(); document.execCommand('Copy')">
     </form>
 
         <div align="center">
             <h4><{$smarty.const._PREVIEW}></h4><br>
             <IFRAME style="background-color: #FFFFFF;" ; src="<{$xoops_url}>/modules/<{$lang_moduledirname}>/syndication.php"
                     frameborder="0" width="240" height="280" allowtransparency="true" topmargin="0"
-                    leftmargin="0" scrolling='no' marginwidth="0" marginheight="0"/>
+                    leftmargin="0" scrolling='no' marginwidth="0" marginheight="0">
             [Your user agent does not support frames or is currently configured not to display frames.]
             </IFRAME>
         </div>

diff --git a/EXTRA/themes/xbootstrap/modules/lexikon/lx_entry.tpl b/EXTRA/themes/xbootstrap/modules/lexikon/lx_entry.tpl
@@ -104,7 +104,7 @@
             <{if $bookmarkme|default:0 == 3}>
                 &nbsp; <!-- AddThis Bookmark Button -->
                 <a href="http://www.addthis.com/bookmark.php" onclick="addthis_url = location.href; addthis_title = document.title; return addthis_click(this);" target="_blank">
-                    <img src="assets/images/addthis_button1-bm.gif" align="absmiddle" width="125" height="16" border="0" alt="AddThis Social Bookmark Button"/>
+                    <img src="assets/images/addthis_button1-bm.gif" align="absmiddle" width="125" height="16" border="0" alt="AddThis Social Bookmark Button">
                 </a>
                 <script type="text/javascript">var addthis_pub = 'JJXUY2C9CQIWTKI1';</script>
                 <script type="text/javascript" src="http://s9.addthis.com/js/widget.php?v=10"></script>

diff --git a/EXTRA/themes/xbootstrap/modules/lexikon/lx_header.tpl b/EXTRA/themes/xbootstrap/modules/lexikon/lx_header.tpl
@@ -28,7 +28,7 @@
                         <a href="<{$xoops_url}>/modules/<{$lang_moduledirname}>/category.php?categoryID=<{$category.id}>"
                            target="_parent">
                             <img src="<{$xoops_url}>/uploads/lexikon/categories/images/<{$catlinks.image}>"
-                                 width="<{$logo_maximgwidth}>" align="middle" alt="[<{$catlinks.total}>]"/></A>
+                                 width="<{$logo_maximgwidth}>" align="middle" alt="[<{$catlinks.total}>]"></A>
                     <{/if}>
                     <{if $catlinks.total|default:0 > 0}><a href="<{$xoops_url}>/modules/<{$lang_moduledirname}>/category.php?categoryID=<{$catlinks.id}>" title="[<{$catlinks.total}>]"><{/if}><{$catlinks.linktext}>
                     <{if $catlinks.total|default:0 > 0}></a> <{/if}>[<{$catlinks.total}>] |

diff --git a/EXTRA/themes/xbootstrap/modules/lexikon/lx_index.tpl b/EXTRA/themes/xbootstrap/modules/lexikon/lx_index.tpl
@@ -8,7 +8,7 @@
     <div class="alert alert-warning" role="alert"><{$smarty.const._MD_LEXIKON_STILLNOTHINGHERE}></div>
 <{/if}>
 
-<{if $teaser == true}>
+<{if $teaser === true}>
 <div class="row" >
   <div class="col-md-12">
     <div class="panel panel-default">
@@ -32,8 +32,8 @@
       <{$smarty.const._MD_LEXIKON_DEFS}><{$publishedwords}><br>
       <{if $multicats|default:0 == 1}><{$smarty.const._MD_LEXIKON_CATS}><{$totalcats}><br><{/if}>
       <div style="padding-top: 10px">
-        <input class="btn btn-success btn-sm" type="button" value="<{$smarty.const._MD_LEXIKON_SUBMITENTRY}>" onclick="location.href = 'submit.php'"/>
-        <input class="btn btn-info btn-sm" type="button" value="<{$smarty.const._MD_LEXIKON_REQUESTDEF}>" onclick="location.href = 'request.php' "/>
+        <input class="btn btn-success btn-sm" type="button" value="<{$smarty.const._MD_LEXIKON_SUBMITENTRY}>" onclick="location.href = 'submit.php'">
+        <input class="btn btn-info btn-sm" type="button" value="<{$smarty.const._MD_LEXIKON_REQUESTDEF}>" onclick="location.href = 'request.php' ">
       </div>
     </div>
   </div>
@@ -95,7 +95,7 @@
                         <a href="<{$xoops_url}>/modules/<{$lang_moduledirname}>/category.php?categoryID=<{$catlinks.id}>" target="_parent">
                             <img src="<{$xoops_url}>/uploads/<{$lang_moduledirname}>/categories/images/<{$catlinks.image}>" 
                                 width="<{$logo_maximgwidth}>" align="left" class="floatLeft"
-                                alt="[<{$catlinks.name}>]&nbsp;[<{$catlinks.total}>]"/>
+                                alt="[<{$catlinks.name}>]&nbsp;[<{$catlinks.total}>]">
                          </a>
                      <{/if}>
                      <{if $catlinks.count|default:0 > 0}>
@@ -136,7 +136,7 @@
                         <a href="<{$xoops_url}>/modules/<{$lang_moduledirname}>/category.php?categoryID=<{$catlinks.id}>" target="_parent">
                             <img src="<{$xoops_url}>/uploads/<{$lang_moduledirname}>/categories/images/<{$catlinks.image}>" 
                                 width="<{$logo_maximgwidth}>" align="left" class="floatLeft"
-                                alt="[<{$catlinks.name}>]&nbsp;[<{$catlinks.total}>]"/>
+                                alt="[<{$catlinks.name}>]&nbsp;[<{$catlinks.total}>]">
                          </a>
                      <{/if}>
                      <{if $catlinks.count|default:0 > 0}>
@@ -269,10 +269,10 @@
     </dl>
 <{/if}>
 
-<{if $syndication == true}>
+<{if $syndication === true}>
     <div align="center" class="clearer" style="padding: 4px;"><br><br>
         <a href="rss.php" title="recent glossary definitions">
-            <img src="assets/images/rss.gif" ALT="RSS" border="0"/>
+            <img src="assets/images/rss.gif" ALT="RSS" border="0">
         </a>
     </div>
 <{/if}>