Menu
▾
▴
[xoops-svn] SF.net SVN: xoops:[9281] XoopsModules/songlist
|
From: <wis...@us...> - 2012-04-04 23:37:51
|
Revision: 9281
http://xoops.svn.sourceforge.net/xoops/?rev=9281&view=rev
Author: wishcraft
Date: 2012-04-04 23:37:44 +0000 (Wed, 04 Apr 2012)
Log Message:
-----------
Karioki Song List 1.10 - complete third release - production - All Listed bugs by the client fixed. (mamba's template error)
Modified Paths:
--------------
XoopsModules/songlist/releases/1.10/htdocs/modules/songlist/class/songs.php
XoopsModules/songlist/releases/1.10/htdocs/modules/songlist/css/songlist.css
XoopsModules/songlist/releases/1.10/htdocs/modules/songlist/language/english/main.php
XoopsModules/songlist/releases/1.10/htdocs/modules/songlist/templates/songlist_cpanel_songs_list.html
XoopsModules/songlist/releases/1.10/htdocs/modules/songlist/templates/songlist_songs_item.html
XoopsModules/songlist/trunk/htdocs/modules/songlist/class/songs.php
XoopsModules/songlist/trunk/htdocs/modules/songlist/css/songlist.css
XoopsModules/songlist/trunk/htdocs/modules/songlist/language/english/main.php
XoopsModules/songlist/trunk/htdocs/modules/songlist/templates/songlist_cpanel_songs_list.html
XoopsModules/songlist/trunk/htdocs/modules/songlist/templates/songlist_songs_item.html
Modified: XoopsModules/songlist/releases/1.10/htdocs/modules/songlist/class/songs.php
===================================================================
--- XoopsModules/songlist/releases/1.10/htdocs/modules/songlist/class/songs.php 2012-04-04 23:04:35 UTC (rev 9280)
+++ XoopsModules/songlist/releases/1.10/htdocs/modules/songlist/class/songs.php 2012-04-04 23:37:44 UTC (rev 9281)
@@ -19,7 +19,7 @@
$this->initVar('abid', XOBJ_DTYPE_INT, 0, false);
$this->initVar('songid', XOBJ_DTYPE_TXTBOX, null, false, 32);
$this->initVar('title', XOBJ_DTYPE_TXTBOX, null, false, 128);
- $this->initVar('lyrics', XOBJ_DTYPE_TXTBOX, null, false, 650);
+ $this->initVar('lyrics', XOBJ_DTYPE_OTHER, null, false, 650);
$this->initVar('hits', XOBJ_DTYPE_INT, 0, false);
$this->initVar('rank', XOBJ_DTYPE_DECIMAL, 0, false);
$this->initVar('votes', XOBJ_DTYPE_INT, 0, false);
@@ -34,6 +34,9 @@
function toArray($extra = true) {
$ret = parent::toArray();
+
+ $ret['lyrics'] = $GLOBALS['myts']->displayTarea($this->getVar('lyrics'), true, true, true, true, true);
+
$form = $this->getForm(true);
foreach($form as $key => $element) {
$ret['form'][$key] = $form[$key]->render();
@@ -271,12 +274,14 @@
$album->setVar('sids', $arry);
$albums_handler->insert($album);
}
- if ($obj->vars['aid']['value']>0) {
- $artist = $artists_handler->get($obj->vars['aid']['value']);
- $arry = $artist->getVar('sids');
- $arry[$sid] = $sid;
- $artist->setVar('sids', $arry);
- $artists_handler->insert($artist);
+ if (count($obj->getVar('aids'))>0) {
+ foreach($obj->getVar('aids') as $aid) {
+ $artist = $artists_handler->get($aid);
+ $arry = $artist->getVar('sids');
+ $arry[$sid] = $sid;
+ $artist->setVar('sids', $arry);
+ $artists_handler->insert($artist);
+ }
}
return $sid;
}
Modified: XoopsModules/songlist/releases/1.10/htdocs/modules/songlist/css/songlist.css
===================================================================
--- XoopsModules/songlist/releases/1.10/htdocs/modules/songlist/css/songlist.css 2012-04-04 23:04:35 UTC (rev 9280)
+++ XoopsModules/songlist/releases/1.10/htdocs/modules/songlist/css/songlist.css 2012-04-04 23:37:44 UTC (rev 9281)
@@ -152,6 +152,7 @@
clear:both;
margin-left: 35px;
margin-top: 3px;
+ margin-bottom: 10px;
}
.sl_subsong {
@@ -166,4 +167,5 @@
border-style: dotted;
border-width: 1px;
clear:both;
+ width:320px;
}
Modified: XoopsModules/songlist/releases/1.10/htdocs/modules/songlist/language/english/main.php
===================================================================
--- XoopsModules/songlist/releases/1.10/htdocs/modules/songlist/language/english/main.php 2012-04-04 23:04:35 UTC (rev 9280)
+++ XoopsModules/songlist/releases/1.10/htdocs/modules/songlist/language/english/main.php 2012-04-04 23:37:44 UTC (rev 9281)
@@ -9,6 +9,9 @@
define('_MN_SONGLIST_TAGS', 'Tags:-');
define('_MN_SONGLIST_SONGS', 'Song\'s:-');
define('_MN_SONGLIST_ALBUMS', 'Album\'s:-');
+ define('_MN_SONGLIST_LYRICS', 'Lyric\'s:-');
+ define('_MN_SONGLIST_GENRE', 'Genre:-');
+ define('_MN_SONGLIST_CATEGORY', 'Category:-');
// Browse By
define('_MN_SONGLIST_BROWSEBY', 'Browse by Character');
Modified: XoopsModules/songlist/releases/1.10/htdocs/modules/songlist/templates/songlist_cpanel_songs_list.html
===================================================================
--- XoopsModules/songlist/releases/1.10/htdocs/modules/songlist/templates/songlist_cpanel_songs_list.html 2012-04-04 23:04:35 UTC (rev 9280)
+++ XoopsModules/songlist/releases/1.10/htdocs/modules/songlist/templates/songlist_cpanel_songs_list.html 2012-04-04 23:37:44 UTC (rev 9281)
@@ -60,7 +60,7 @@
</tr>
<{/foreach}>
<tr class="foot">
- <td colspan="10"><input type='submit' name='submit' value='<{$smarty.const._SUBMIT}>'/></td>
+ <td colspan="11"><input type='submit' name='submit' value='<{$smarty.const._SUBMIT}>'/></td>
</tr>
</table>
<input type='hidden' name='op' value='category'/>
Modified: XoopsModules/songlist/releases/1.10/htdocs/modules/songlist/templates/songlist_songs_item.html
===================================================================
--- XoopsModules/songlist/releases/1.10/htdocs/modules/songlist/templates/songlist_songs_item.html 2012-04-04 23:04:35 UTC (rev 9280)
+++ XoopsModules/songlist/releases/1.10/htdocs/modules/songlist/templates/songlist_songs_item.html 2012-04-04 23:37:44 UTC (rev 9281)
@@ -1,3 +1,17 @@
+<h1><{$song.title}><{if $song.songid}> - <{$song.songid}><{/if}></h1>
+<{if $song.category}>
+<div class="sl_subtitle">
+ <{$smarty.const._MN_SONGLIST_CATEGORY}>
+</div>
+<{if $song.category.picture}>
+<div class="sl_artsong">
+ <img src='<{$song.category.picture}>' width="95%" border="0" />
+</div>
+<{/if}>
+<div class="sl_mainsong">
+ <{$song.category.name}>
+</div>
+<{/if}>
<{if $song.album}>
<div class="sl_subtitle">
<{$smarty.const._MN_SONGLIST_ALBUM}>
@@ -3,5 +17,5 @@
</div>
<div class="sl_mainsong">
- <{$song.album.name}>
+ <{$song.album.title}>
</div>
<{if $song.album.picture}>
@@ -11,6 +25,14 @@
</div>
<{/if}>
<{/if}>
+<{if $song.genre}>
+<div class="sl_subtitle">
+ <{$smarty.const._MN_SONGLIST_GENRE}>
+</div>
+<div class="sl_mainsong">
+ <{$song.genre.name}>
+</div>
+<{/if}>
<{if $song.artists_array}>
<div class="sl_subtitle">
<{if count($song.artists_array) > 1}>
@@ -47,6 +69,12 @@
<{include file="db:tag_bar.html" tagbar=$song.tagbar}>
</div>
<{/if}>
+<div class="sl_subtitle">
+ <{$smarty.const._MN_SONGLIST_LYRICS}>
+</div>
+<div class="sl_mainsong">
+ <{$song.lyrics}>
+</div>
<{foreach from=$song.fields item=field}>
<div class="sl_subtitle">
<{$field.title}>
@@ -54,4 +82,4 @@
<div class="sl_mainsong">
<{$field.value}>
</div>
-<{/foreach}>
\ No newline at end of file
+<{/foreach}>
Modified: XoopsModules/songlist/trunk/htdocs/modules/songlist/class/songs.php
===================================================================
--- XoopsModules/songlist/trunk/htdocs/modules/songlist/class/songs.php 2012-04-04 23:04:35 UTC (rev 9280)
+++ XoopsModules/songlist/trunk/htdocs/modules/songlist/class/songs.php 2012-04-04 23:37:44 UTC (rev 9281)
@@ -19,7 +19,7 @@
$this->initVar('abid', XOBJ_DTYPE_INT, 0, false);
$this->initVar('songid', XOBJ_DTYPE_TXTBOX, null, false, 32);
$this->initVar('title', XOBJ_DTYPE_TXTBOX, null, false, 128);
- $this->initVar('lyrics', XOBJ_DTYPE_TXTBOX, null, false, 650);
+ $this->initVar('lyrics', XOBJ_DTYPE_OTHER, null, false, 650);
$this->initVar('hits', XOBJ_DTYPE_INT, 0, false);
$this->initVar('rank', XOBJ_DTYPE_DECIMAL, 0, false);
$this->initVar('votes', XOBJ_DTYPE_INT, 0, false);
@@ -34,6 +34,9 @@
function toArray($extra = true) {
$ret = parent::toArray();
+
+ $ret['lyrics'] = $GLOBALS['myts']->displayTarea($this->getVar('lyrics'), true, true, true, true, true);
+
$form = $this->getForm(true);
foreach($form as $key => $element) {
$ret['form'][$key] = $form[$key]->render();
@@ -271,12 +274,14 @@
$album->setVar('sids', $arry);
$albums_handler->insert($album);
}
- if ($obj->vars['aid']['value']>0) {
- $artist = $artists_handler->get($obj->vars['aid']['value']);
- $arry = $artist->getVar('sids');
- $arry[$sid] = $sid;
- $artist->setVar('sids', $arry);
- $artists_handler->insert($artist);
+ if (count($obj->getVar('aids'))>0) {
+ foreach($obj->getVar('aids') as $aid) {
+ $artist = $artists_handler->get($aid);
+ $arry = $artist->getVar('sids');
+ $arry[$sid] = $sid;
+ $artist->setVar('sids', $arry);
+ $artists_handler->insert($artist);
+ }
}
return $sid;
}
Modified: XoopsModules/songlist/trunk/htdocs/modules/songlist/css/songlist.css
===================================================================
--- XoopsModules/songlist/trunk/htdocs/modules/songlist/css/songlist.css 2012-04-04 23:04:35 UTC (rev 9280)
+++ XoopsModules/songlist/trunk/htdocs/modules/songlist/css/songlist.css 2012-04-04 23:37:44 UTC (rev 9281)
@@ -152,6 +152,7 @@
clear:both;
margin-left: 35px;
margin-top: 3px;
+ margin-bottom: 10px;
}
.sl_subsong {
@@ -166,4 +167,5 @@
border-style: dotted;
border-width: 1px;
clear:both;
+ width:320px;
}
Modified: XoopsModules/songlist/trunk/htdocs/modules/songlist/language/english/main.php
===================================================================
--- XoopsModules/songlist/trunk/htdocs/modules/songlist/language/english/main.php 2012-04-04 23:04:35 UTC (rev 9280)
+++ XoopsModules/songlist/trunk/htdocs/modules/songlist/language/english/main.php 2012-04-04 23:37:44 UTC (rev 9281)
@@ -9,6 +9,9 @@
define('_MN_SONGLIST_TAGS', 'Tags:-');
define('_MN_SONGLIST_SONGS', 'Song\'s:-');
define('_MN_SONGLIST_ALBUMS', 'Album\'s:-');
+ define('_MN_SONGLIST_LYRICS', 'Lyric\'s:-');
+ define('_MN_SONGLIST_GENRE', 'Genre:-');
+ define('_MN_SONGLIST_CATEGORY', 'Category:-');
// Browse By
define('_MN_SONGLIST_BROWSEBY', 'Browse by Character');
Modified: XoopsModules/songlist/trunk/htdocs/modules/songlist/templates/songlist_cpanel_songs_list.html
===================================================================
--- XoopsModules/songlist/trunk/htdocs/modules/songlist/templates/songlist_cpanel_songs_list.html 2012-04-04 23:04:35 UTC (rev 9280)
+++ XoopsModules/songlist/trunk/htdocs/modules/songlist/templates/songlist_cpanel_songs_list.html 2012-04-04 23:37:44 UTC (rev 9281)
@@ -60,7 +60,7 @@
</tr>
<{/foreach}>
<tr class="foot">
- <td colspan="10"><input type='submit' name='submit' value='<{$smarty.const._SUBMIT}>'/></td>
+ <td colspan="11"><input type='submit' name='submit' value='<{$smarty.const._SUBMIT}>'/></td>
</tr>
</table>
<input type='hidden' name='op' value='category'/>
Modified: XoopsModules/songlist/trunk/htdocs/modules/songlist/templates/songlist_songs_item.html
===================================================================
--- XoopsModules/songlist/trunk/htdocs/modules/songlist/templates/songlist_songs_item.html 2012-04-04 23:04:35 UTC (rev 9280)
+++ XoopsModules/songlist/trunk/htdocs/modules/songlist/templates/songlist_songs_item.html 2012-04-04 23:37:44 UTC (rev 9281)
@@ -1,3 +1,17 @@
+<h1><{$song.title}><{if $song.songid}> - <{$song.songid}><{/if}></h1>
+<{if $song.category}>
+<div class="sl_subtitle">
+ <{$smarty.const._MN_SONGLIST_CATEGORY}>
+</div>
+<{if $song.category.picture}>
+<div class="sl_artsong">
+ <img src='<{$song.category.picture}>' width="95%" border="0" />
+</div>
+<{/if}>
+<div class="sl_mainsong">
+ <{$song.category.name}>
+</div>
+<{/if}>
<{if $song.album}>
<div class="sl_subtitle">
<{$smarty.const._MN_SONGLIST_ALBUM}>
@@ -3,5 +17,5 @@
</div>
<div class="sl_mainsong">
- <{$song.album.name}>
+ <{$song.album.title}>
</div>
<{if $song.album.picture}>
@@ -11,6 +25,14 @@
</div>
<{/if}>
<{/if}>
+<{if $song.genre}>
+<div class="sl_subtitle">
+ <{$smarty.const._MN_SONGLIST_GENRE}>
+</div>
+<div class="sl_mainsong">
+ <{$song.genre.name}>
+</div>
+<{/if}>
<{if $song.artists_array}>
<div class="sl_subtitle">
<{if count($song.artists_array) > 1}>
@@ -47,6 +69,12 @@
<{include file="db:tag_bar.html" tagbar=$song.tagbar}>
</div>
<{/if}>
+<div class="sl_subtitle">
+ <{$smarty.const._MN_SONGLIST_LYRICS}>
+</div>
+<div class="sl_mainsong">
+ <{$song.lyrics}>
+</div>
<{foreach from=$song.fields item=field}>
<div class="sl_subtitle">
<{$field.title}>
@@ -54,4 +82,4 @@
<div class="sl_mainsong">
<{$field.value}>
</div>
-<{/foreach}>
\ No newline at end of file
+<{/foreach}>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
