Xibo

Merge lp:~dangarner/xibo/160-rc1-final into lp:xibo/1.6

  1. 160-rc1-final
  2. Merge into ponswinnecke
Proposed by Dan Garner
Status: Merged
Approved by: Dan Garner
Approved revision: 301
Merged at revision: 299
Proposed branch: lp:~dangarner/xibo/160-rc1-final
Merge into: lp:xibo/1.6
Diff against target: 135 lines (+11/-5)
9 files modified
client/dotNET/Properties/Settings.Designer.cs (+1/-1)
client/dotNET/Properties/Settings.settings (+1/-1)
client/dotNET/app.config (+1/-1)
server/lib/pages/content.class.php (+1/-0)
server/lib/pages/layout.class.php (+2/-0)
server/manual/content/install/install_client.php (+1/-1)
server/theme/default/html/layout_page_grid.php (+2/-0)
server/theme/default/html/library_form_media_add.php (+0/-1)
server/theme/default/html/library_page_grid.php (+2/-0)
To merge this branch: bzr merge lp:~dangarner/xibo/160-rc1-final
Reviewer Review Type Date Requested Status
Xibo Maintainters Pending
Review via email: mp+205475@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 'client/dotNET/Properties/Settings.Designer.cs'
2--- client/dotNET/Properties/Settings.Designer.cs 2013-09-28 10:28:09 +0000
3+++ client/dotNET/Properties/Settings.Designer.cs 2014-02-08 15:01:24 +0000
4@@ -271,7 +271,7 @@
5
6 [global::System.Configuration.ApplicationScopedSettingAttribute()]
7 [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
8- [global::System.Configuration.DefaultSettingValueAttribute("1.5.2")]
9+ [global::System.Configuration.DefaultSettingValueAttribute("1.6.0-rc1")]
10 public string ClientVersion {
11 get {
12 return ((string)(this["ClientVersion"]));
13
14=== modified file 'client/dotNET/Properties/Settings.settings'
15--- client/dotNET/Properties/Settings.settings 2013-09-28 10:28:09 +0000
16+++ client/dotNET/Properties/Settings.settings 2014-02-08 15:01:24 +0000
17@@ -69,7 +69,7 @@
18 <Value Profile="(Default)">cacheManager.xml</Value>
19 </Setting>
20 <Setting Name="ClientVersion" Type="System.String" Scope="Application">
21- <Value Profile="(Default)">1.5.2</Value>
22+ <Value Profile="(Default)">1.6.0-rc1</Value>
23 </Setting>
24 <Setting Name="scrollStepAmount" Type="System.Decimal" Scope="User">
25 <Value Profile="(Default)">1</Value>
26
27=== modified file 'client/dotNET/app.config'
28--- client/dotNET/app.config 2013-09-28 10:28:09 +0000
29+++ client/dotNET/app.config 2014-02-08 15:01:24 +0000
30@@ -138,7 +138,7 @@
31 <value>cacheManager.xml</value>
32 </setting>
33 <setting name="ClientVersion" serializeAs="String">
34- <value>1.5.2</value>
35+ <value>1.6.0-rc1</value>
36 </setting>
37 <setting name="xmdsResetTimeout" serializeAs="String">
38 <value>900</value>
39
40=== modified file 'server/lib/pages/content.class.php'
41--- server/lib/pages/content.class.php 2014-01-18 16:35:53 +0000
42+++ server/lib/pages/content.class.php 2014-02-08 15:01:24 +0000
43@@ -157,6 +157,7 @@
44 $output = Theme::RenderReturn('library_page_grid');
45
46 $response->SetGridResponse($output);
47+ $response->initialSortColumn = 2;
48 $response->Respond();
49 }
50
51
52=== modified file 'server/lib/pages/layout.class.php'
53--- server/lib/pages/layout.class.php 2014-01-18 09:47:41 +0000
54+++ server/lib/pages/layout.class.php 2014-02-08 15:01:24 +0000
55@@ -363,6 +363,7 @@
56 // Construct an object containing all the layouts, and pass to the theme
57 $row = array();
58
59+ $row['layoutid'] = $layout['layoutid'];
60 $row['layout'] = $layout['layout'];
61 $row['description'] = $layout['description'];
62 $row['owner'] = $user->getNameFromID($layout['ownerid']);
63@@ -453,6 +454,7 @@
64 $output = Theme::RenderReturn('layout_page_grid');
65
66 $response->SetGridResponse($output);
67+ $response->initialSortColumn = 2;
68 $response->Respond();
69 }
70
71
72=== modified file 'server/manual/content/install/install_client.php'
73--- server/manual/content/install/install_client.php 2014-01-18 09:47:41 +0000
74+++ server/manual/content/install/install_client.php 2014-02-08 15:01:24 +0000
75@@ -105,7 +105,7 @@
76 leave this set to 1px for smooth viewing.</li>
77
78 <li><p>Enable Powerpoint: Tick the box if you have the full version of PowerPoint 2003 or later installed and want to use PowerPoint media items.</p>
79- <div class="alert alert-info">Be sure to read the notes on Powerpoint setup here: <a href="windows.php"> Windows Modifications.</a></div></li>
80+ <div class="alert alert-info">Be sure to read the notes on Powerpoint setup here: <a href="#windows_modifications"> Windows Modifications.</a></div></li>
81
82 <li>Enable Statistics: Tick the box if you want the client to send statistics back to the <?php echo PRODUCT_NAME; ?> server. This will generate alot of data that will be
83 stored in the <?php echo PRODUCT_NAME; ?> database. If you don't have any specific use for statistics, we recommend you turn this option off.
84
85=== modified file 'server/theme/default/html/layout_page_grid.php'
86--- server/theme/default/html/layout_page_grid.php 2014-01-18 09:47:41 +0000
87+++ server/theme/default/html/layout_page_grid.php 2014-02-08 15:01:24 +0000
88@@ -34,6 +34,7 @@
89 <table class="table">
90 <thead>
91 <tr>
92+ <th><?php echo Theme::Translate('ID'); ?></th>
93 <th><?php echo Theme::Translate('Name'); ?></th>
94 <th><?php echo Theme::Translate('Description'); ?></th>
95 <th><?php echo Theme::Translate('Owner'); ?></th>
96@@ -44,6 +45,7 @@
97 <tbody>
98 <?php foreach(Theme::Get('table_rows') as $row) { ?>
99 <tr ondblclick="return XiboFormRender('<?php echo $row['layout_form_edit_url']; ?>')">
100+ <td><?php echo $row['layoutid']; ?></td>
101 <td><?php echo $row['layout']; ?></td>
102 <td><?php echo $row['description']; ?></td>
103 <td><?php echo $row['owner']; ?></td>
104
105=== modified file 'server/theme/default/html/library_form_media_add.php'
106--- server/theme/default/html/library_form_media_add.php 2014-01-18 09:47:41 +0000
107+++ server/theme/default/html/library_form_media_add.php 2014-02-08 15:01:24 +0000
108@@ -44,7 +44,6 @@
109 <i class="icon-ban-circle icon-white"></i>
110 <span>Cancel upload</span>
111 </button>
112- <input type="checkbox" class="toggle">
113 <!-- The loading indicator is shown during file processing -->
114 <span class="fileupload-loading"></span>
115 </div>
116
117=== modified file 'server/theme/default/html/library_page_grid.php'
118--- server/theme/default/html/library_page_grid.php 2014-01-18 09:47:41 +0000
119+++ server/theme/default/html/library_page_grid.php 2014-02-08 15:01:24 +0000
120@@ -38,6 +38,7 @@
121 <table class="table">
122 <thead>
123 <tr>
124+ <th><?php echo Theme::Translate('ID'); ?></th>
125 <th><?php echo Theme::Translate('Name'); ?></th>
126 <th><?php echo Theme::Translate('Type'); ?></th>
127 <th><?php echo Theme::Translate('Duration'); ?></th>
128@@ -51,6 +52,7 @@
129 <tbody>
130 <?php foreach(Theme::Get('table_rows') as $row) { ?>
131 <tr>
132+ <td><?php echo $row['mediaid']; ?></td>
133 <td><?php echo $row['media']; ?></td>
134 <td><?php echo $row['mediatype']; ?></td>
135 <td><?php echo $row['duration_text']; ?></td>

Subscribers

People subscribed via source and target branches

to all changes: