Changeset 93 for branches/communities/jamendo/applications

Timestamp:

15/01/09 16:06:13 (20 months ago)

Author:

sylvinus

Message:

jamendo app improvements

Location:

branches/communities/jamendo/applications/luci-jamendo

Files:

• luasrc/controller/jamendo.lua (modified) (4 diffs)
• luasrc/view/jamendo/index.htm (modified) (3 diffs)
• luasrc/view/jamendo/license.htm (modified) (1 diff)
• root/etc/config/jamendo (modified) (1 diff)
• upgrade (modified) (3 diffs)

branches/communities/jamendo/applications/luci-jamendo/luasrc/controller/jamendo.lua

@@ -3 +3 @@
 
 function index()
-        local page = entry({"fon_services", "fon_jamendo"}, call("jamendo"), "Jamendo Radios", 90)
+        local page = entry({"Jamendo"}, call("jamendo"), "Jamendo Radios", 90) -- {"fon_services", "fon_jamendo"}
         page.icon_path = "/luci-static/resources/icons/"
         page.icon = "jamendo.png"
@@ -25 +25 @@
         local firsttime = false
         
+        local hwaddr = false
+        
         if not radioid then
                 firsttime = true
@@ -35 +37 @@
                 uci:commit("jamendo")
                 
-                        
-                -- how to do this properly on install?
-                sys.call("chmod +x /usr/sbin/jamendoradio")
-                
-                
-                
+
                 local service = srv.Service("jamendoradio")
                 service:stop()
@@ -60 +57 @@
         
         if dolicense then
-        
-                tpl.render("jamendo/license",{jamendo_fonid=42})
+                hwaddr = sys.exec('ifconfig wifi0 | grep HWaddr | awk -F "HWaddr " \'{ print $2 }\' | awk \'{gsub(":","-",$1); print substr($0,0,17) }\'')
+                tpl.render("jamendo/license",{jamendo_fonid=hwaddr,jamendo_test="aaa"})
         
         else

branches/communities/jamendo/applications/luci-jamendo/luasrc/view/jamendo/index.htm

@@ -61 +61 @@
 <div id="jamendo_change_radio">    
 
-        <img style="float:right;" src="/luci-static/resources/jamendo/logo_small.png" />
+        <a href="http://pro.jamendo.com/" target="_blank"><img style="border:0;float:right;" src="/luci-static/resources/jamendo/logo_small.png" /></a>
 
 
@@ -107 +107 @@
 
         <div class="boxerror">
-                Radios are currently in DEMO mode. To play them legally in a commercial environment, <a href="<%=REQUEST_URI%>?jamendo_license=1">please buy a license now</a>.
+                Radios are currently in DEMO mode. With Jamendo, you can <a href="<%=REQUEST_URI%>?jamendo_license=1">avoid paying your local collective rights society</a>.
         </div>
         <br/>
@@ -123 +123 @@
 
         <div class="boxwarning">
-                Radios are currently in DEMO mode. To play them legally in a commercial environment, <a href="<%=REQUEST_URI%>?jamendo_license=1">please buy a license now</a>.
+                Radios are currently in DEMO mode. With Jamendo, you can <a href="<%=REQUEST_URI%>?jamendo_license=1">avoid paying your local collective rights society</a>.
         </div>
         

branches/communities/jamendo/applications/luci-jamendo/luasrc/view/jamendo/license.htm

@@ -15 +15 @@
 <div id="jamendo_change_radio">    
 
-        <iframe id="pro_jamendo_shop" src="http://fon.pro.localjamendo.com/product/publicspace?pro_partner_id=<%=PRO_PARTNER_ID%>" />
+        <iframe id="pro_jamendo_shop" src="http://fon.pro.jamendo.com/product/publicspace?pro_partner_id=<%=jamendo_fonid%>" />
 
 </div>

branches/communities/jamendo/applications/luci-jamendo/root/etc/config/jamendo

@@ -1 +1 @@
 config general radio
-        option id lounge
-        option autostart 1
+        option id off

branches/communities/jamendo/applications/luci-jamendo/upgrade

@@ -12 +12 @@
 -- Dashboard Information
 local DASHBOARD = true          -- Show plugin on dashboard
-local DB_ICON   = "jamendo.png"  -- Plugin icon file relative to /luci-static/resources
+local DB_ICON   = "icons/jamendo.png"  -- Plugin icon file relative to /luci-static/resources
 local DB_ORDER  = 1000          -- Plugin dashboard order number
 
@@ -20 +20 @@
 local fs = require "luci.fs"
 local dir = require "posix".getcwd()
+local sys = require "luci.sys"
 
 -- Create Plugin object
@@ -54 +55 @@
         fs.chmod(file, mode)
 end
+
+-- Just to be sure
+sys.call("chmod +x /usr/sbin/jamendoradio")