Xibo

Merge lp:~alexharrington/xibo/590351 into lp:xibo/1.2

  1. 590351
  2. Merge into biela
Proposed by Alex Harrington
Status: Merged
Merged at revision: 145
Proposed branch: lp:~alexharrington/xibo/590351
Merge into: lp:xibo/1.2
Diff against target: 12 lines (+1/-1)
1 file modified
server/install/database/3.sql (+1/-1)
To merge this branch: bzr merge lp:~alexharrington/xibo/590351
Reviewer Review Type Date Requested Status
Xibo Maintainters Pending
Review via email: mp+26880@code.launchpad.net
To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'server/install/database/3.sql'
2--- server/install/database/3.sql 2009-12-31 11:38:50 +0000
3+++ server/install/database/3.sql 2010-06-06 10:10:40 +0000
4@@ -2,7 +2,7 @@
5
6 -- Default Layout
7 INSERT INTO `layout` (`layoutID`, `layout`, `permissionID`, `xml`, `userID`, `createdDT`, `modifiedDT`, `description`, `tags`, `templateID`, `retired`, `duration`, `background`) VALUES (NULL, 'Default Layout', '3', '<?xml version="1.0"?>
8-<layout width="800" height="500" bgcolor="#000000"><region id="47ff29524ce1b" width="800" height="500" top="0" left="0"><media id="ba2b90ee2e21f9aaffbc45f253068c60" type="text" duration="20" lkid="" schemaVersion="1">
9+<layout schemaVersion="1" width="800" height="500" bgcolor="#000000"><region id="47ff29524ce1b" width="800" height="500" top="0" left="0"><media id="ba2b90ee2e21f9aaffbc45f253068c60" type="text" duration="20" lkid="" schemaVersion="1">
10 <options><direction>none</direction></options>
11 <raw><text><![CDATA[<h1 style="text-align: center;"><span style="font-size: 2em;"><span style="font-family: Verdana;"><span style="color: rgb(255, 255, 255);">Welcome to </span></span></span></h1><h1 style="text-align: center;"><span style="font-size: 2em;"><span style="font-family: Verdana;"><span style="color: rgb(255, 255, 255);">Xibo! </span></span></span></h1><h1 style="text-align: center;"><span style="font-size: 2em;"><span style="font-family: Verdana;"><span style="color: rgb(255, 255, 255);">Open Source Digital Signage</span></span></span></h1><p style="text-align: center;"><span style="font-family: Verdana;"><span style="color: rgb(255, 255, 255);"><span style="font-size: 1.6em;">This is the default layout - please feel free to change it whenever you like!</span></span></span></p>]]></text></raw>
12 </media><media id="7695b17df85b666d420c232ee768ef68" type="ticker" duration="100" lkid="" schemaVersion="1">

Subscribers

People subscribed via source and target branches