Skip to content

Commit 1600ba4

Browse files
sergejeysergejey
authored
Merge pull request #992 from SmoKE585/alpha
Много нового
2 parents 4c30b28 + 19ceb3d commit 1600ba4

File tree

11 files changed

+308
-128
lines changed

11 files changed

+308
-128
lines changed

‎languages/default.php

+6
Original file line numberDiff line numberDiff line change
@@ -1553,6 +1553,12 @@
15531553
'NEWDASH_DMB_TITLE_MODAL_STEP2' => '2. The script should return the following JSON object: ',
15541554
'NEWDASH_DMB_TITLE_MODAL_STEP3' => '3. That\'s all. The control panel will pick up the script by itself and display the content on the main page. ',
15551555

1556+
'NEWDASH_CONSOLE_CHOOSE_MODULE' => 'Select a module ...',
1557+
'NEWDASH_CONSOLE_SIZE_HINT' => 'This console can be resized',
1558+
'NEWDASH_SEARCH_HINT' => 'System-wide global search. Start typing ... ',
1559+
'NEWDASH_CONNECT_CONNECT_ERROR_1' => 'Your copy of MajorDoMo cannot contact the Connect server. Due to this, the market and some other functions will be unavailable. ',
1560+
'NEWDASH_CONNECT_CONNECT_ERROR_2' => 'Usually the situation will improve after a few minutes.',
1561+
15561562
'NEWDASH_RESULT' => 'Result',
15571563
'NEWDASH_MJDM_VERSION' => 'Current MJDM version',
15581564

‎languages/ru.php

+6
Original file line numberDiff line numberDiff line change
@@ -1552,6 +1552,12 @@
15521552
'NEWDASH_DMB_TITLE_MODAL_STEP2' => '2. Сценарий должен отдавать следующий JSON объект:',
15531553
'NEWDASH_DMB_TITLE_MODAL_STEP3' => '3. На этом все. Панель управления сама подхватит скрипт и выведет содержимое на главную страницу.',
15541554

1555+
'NEWDASH_CONSOLE_CHOOSE_MODULE' => 'Выберите модуль...',
1556+
'NEWDASH_CONSOLE_SIZE_HINT' => 'Размер консоли можно изменить',
1557+
'NEWDASH_SEARCH_HINT' => 'Глобальный поиск по всей системе. Начните вводить...',
1558+
'NEWDASH_CONNECT_CONNECT_ERROR_1' => 'Ваша копия MajorDoMo не может связаться с сервером Connect. Ввиду этого, маркет и некоторые другие функции будут недоступны.',
1559+
'NEWDASH_CONNECT_CONNECT_ERROR_2' => 'Обычно, ситуация налаживаться спустя несколько минут.',
1560+
15551561
'NEWDASH_RESULT' => 'Результат',
15561562
'NEWDASH_MJDM_VERSION' => 'Текущая версия MJDM',
15571563

‎modules/inc_panel_ajax.php

+110-48
Large diffs are not rendered by default.

‎modules/locations/locations_edit.inc.php

+2
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@
3434
} else {
3535
$out['ERR']=1;
3636
}
37+
$this->redirect("?");
3738
}
3839
if (is_array($rec)) {
3940
foreach($rec as $k=>$v) {
@@ -43,4 +44,5 @@
4344
}
4445
}
4546
outHash($rec, $out);
47+
4648
?>

‎modules/market/market.class.php

+18-2
Original file line numberDiff line numberDiff line change
@@ -147,7 +147,7 @@ function admin(&$out)
147147
if (!$this->mode && $mode) {
148148
$this->mode = $mode;
149149
}
150-
150+
151151
$this->can_be_updated = array();
152152
$this->can_be_updated_new = array();
153153
$this->have_updates = array();
@@ -183,13 +183,22 @@ function admin(&$out)
183183
global $mode2;
184184
global $name;
185185
global $names;
186+
global $value;
186187

187188
if (is_array($names)) {
188189
$out['NAMES'] = urlencode(implode(',', $names));
189190
}
190191
$out['NAME'] = urlencode($name);
191192

192193
$out['MODE2'] = $mode2;
194+
195+
if($mode2 == 'dontupdate' && $name) {
196+
if(!$value) {
197+
$this->redirect(SERVER_URL."/panel/market.html");
198+
}
199+
$this->dontupdate($name, $value);
200+
}
201+
193202
return;
194203
}
195204

@@ -409,6 +418,8 @@ function admin(&$out)
409418
if (($rec['EXISTS'] && !$rec['IGNORE_UPDATE']) || $missing[$rec['MODULE_NAME']]) {
410419
$this->can_be_updated[] = array('NAME' => $rec['MODULE_NAME'], 'URL' => $rec['REPOSITORY_URL'], 'VERSION' => $rec['LATEST_VERSION']);
411420
}
421+
422+
//var_dump($rec["LATEST_VERSION"]);
412423
/*
413424
if (in_array($rec['MODULE_NAME'], $names)) {
414425
$this->selected_plugins[] = array('NAME' => $rec['MODULE_NAME'], 'URL' => $rec['REPOSITORY_URL'], 'VERSION' => $rec['LATEST_VERSION']);
@@ -856,7 +867,12 @@ function installUnpacketPlugin($folder, $plugin_name)
856867
*
857868
* @access public
858869
*/
859-
function uninstallPlugin($name, $frame = 0)
870+
function dontupdate($name, $value) {
871+
SQLExec("UPDATE plugins SET CURRENT_VERSION = '".DBSafe($value)."' WHERE MODULE_NAME = '".DBSafe($name)."' LIMIT 1");
872+
$this->redirect(SERVER_URL."/panel/market.html");
873+
}
874+
875+
function uninstallPlugin($name, $frame = 0)
860876
{
861877
if ($frame) {
862878
$this->echonow("Removing module '$name' from database ... ");

‎modules/saverestore/saverestore.class.php

+2
Original file line numberDiff line numberDiff line change
@@ -232,6 +232,8 @@ function admin(&$out)
232232

233233
$out['LATEST_CURR_BRANCH'] = $this->config['LATEST_CURR_BRANCH'];
234234
$out['LATEST_UPDATED_ID'] = $this->config['LATEST_UPDATED_ID'];
235+
$out['LATEST_UPDATED_ID_SLICE'] = mb_strtoupper(substr($this->config['LATEST_UPDATED_ID'], 0, 7));
236+
$out['LATEST_UPDATED_TIME'] = gg('LatestUpdateTimestamp');
235237

236238
$currBranch = explode("/", $update_url);
237239
$out['UPDATE_CURR_BRANCH'] = mb_strtoupper(explode('.', $currBranch[6])[0]);

‎templates/locations/locations_search_admin.html

+112-54
Original file line numberDiff line numberDiff line change
@@ -1,60 +1,118 @@
1-
<!--#
2-
@version 0.3 (auto-set)
3-
#-->
4-
<!-- table locations search -->
1+
<div class="row" style="margin-right: -15px;margin-left: -15px;">
2+
<div class="col-md-12" style="margin-bottom: 15px;">
3+
<div class="alert" style="background: radial-gradient(circle farthest-corner at 450px 10px, #38a276, #2c742d);color: white;text-align: center;border: 0px;">
4+
<i class="glyphicon glyphicon-exclamation-sign" style="font-weight: normal;font-size: 13pt;vertical-align: sub;margin-right: 10px;"></i>
5+
Модуль необходим для добавления и управления расположением (комнатами) в интерфейсе. Вместе с расположением будет создан объект в классе Rooms.
6+
</div>
7+
</div>
8+
</div>
59

6-
<p>
10+
<div class="row" style="margin-right: -15px;margin-left: -15px;">
11+
<div class="col-md-12 col-sm-12 col-xs-12 text-right" style="margin-bottom: 15px;">
12+
<div class="visible-sm visible-xs" style="margin-top: 5px;"></div>
13+
<a href="javascript://" data-toggle="modal" data-target="#modalAddLocation" class="btn btn-success"><i class="glyphicon glyphicon-plus"></i> <#LANG_ADD_NEW_LOCATION#></a>
14+
</div>
15+
</div>
716

8-
<a href="?view_mode=edit_locations" class="btn btn-default"><i class="glyphicon glyphicon-plus"></i> <#LANG_ADD_NEW_LOCATION#></a>
17+
<div class="row" style="margin-right: -15px;margin-left: -15px;">
18+
<div class="col-sm-12" style="margin-bottom: 15px;">
19+
<div class="table-responsive">
20+
[#if RESULT#]
21+
<ul class="list-group">
22+
[#begin RESULT#]
23+
<li class="list-group-item">
24+
<span class="badge" style="background: transparent;">
25+
[#if "<#ACTION#>"=="admin"#]
26+
<div class="btn-group">
27+
<a class="btn btn-default btn-xs" href="?view_mode=priority_up&id=[#ID#]"><i class="glyphicon glyphicon-arrow-up"></i></a>
28+
<a class="btn btn-default btn-xs" href="?view_mode=priority_down&id=[#ID#]"><i class="glyphicon glyphicon-arrow-down"></i></a>
929

10-
</p>
30+
<a class="btn btn-warning btn-xs" href="javascript://" data-toggle="modal" data-target="#modalEditLocation[#ID#]"><i class="glyphicon glyphicon-pencil"></i> Изменить</a>
31+
<a class="btn btn-danger btn-xs" href="?view_mode=delete_locations&id=[#ID#]" onClick="return confirm('Delete record?')"><i class="glyphicon glyphicon-remove"></i> Удалить</a>
32+
</div>
33+
[#endif ACTION#]
34+
</span>
35+
[#TITLE#] <span style="color: lightgray;">(<#LANG_PRIORITY#> - [#PRIORITY#])</span>
36+
</li>
37+
38+
<div class="modal fade" id="modalEditLocation[#ID#]" tabindex="-1" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true">
39+
<div class="modal-dialog">
40+
<div class="modal-content">
41+
<div class="modal-header">
42+
<button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
43+
<h4 class="modal-title" id="myModalLabel"><#LANG_ADD_NEW_LOCATION#></h4>
44+
</div>
45+
<div class="modal-body">
46+
<form action="?" method="post" enctype="multipart/form-data" name="frmEdit" class="form-horizontal">
47+
<div class="form-group" style="margin-right: 0px;margin-left: 0px;">
48+
<label class="col-lg-2 col-md-4" style="max-width: 240px;float: left;padding: 5px 10px 0px 0px;text-align: right;"><#LANG_TITLE#>:<font color="red">*</font></label>
49+
<div class="col-lg-10 col-md-8"><input type="text" class="form-control [#if ERR_TITLE#]alert-danger[#endif#]" name="title" value="[#TITLE#]" required="true"></div>
50+
</div>
51+
<div class="form-group" style="margin-right: 0px;margin-left: 0px;">
52+
<label class="col-lg-2 col-md-4" style="max-width: 240px;float: left;padding: 5px 10px 0px 0px;text-align: right;"><#LANG_PRIORITY#>:<font color="red">*</font></label>
53+
<div class="col-lg-10 col-md-8"><input type="text" class="form-control" name="priority" value="[#PRIORITY#]"></div>
54+
</div>
1155

12-
<!-- results -->
13-
[#if RESULT#]
14-
<!-- search results (list) -->
15-
<form action="?" method="post" name="frmList_locations" style="padding:0px">
16-
<table class="table table-striped">
17-
<thead>
18-
<tr>
19-
<th>
20-
<#LANG_TITLE#>
21-
</th>
22-
<th><#LANG_PRIORITY#></th>
23-
<th>&nbsp;</th>
24-
</tr>
25-
</thead>
26-
[#begin RESULT#]
27-
<tr >
28-
<td
29-
>
30-
<b>
31-
[#TITLE#]
32-
</a></b>
33-
</td>
34-
<td>[#PRIORITY#]</td>
35-
<td width="200">
56+
<div class="form-group">
57+
<div class="col-md-12 text-center">
58+
<input type="submit" name="subm" class="btn btn-default btn-success" value="<#LANG_UPDATE#>">
59+
</div>
60+
</div>
61+
<input type="hidden" name="id" value="[#ID#]">
62+
<input type="hidden" name="view_mode" value="edit_locations">
63+
<input type="hidden" name="edit_mode" value="<#EDIT_MODE#>">
64+
<input type="hidden" name="mode" value="update">
65+
</form>
66+
</div>
67+
<div class="modal-footer">
68+
<button type="button" class="btn btn-default" data-dismiss="modal"><#LANG_CLOSE#></button>
69+
</div>
70+
</div>
71+
</div>
72+
</div>
73+
[#end RESULT#]
74+
</ul>
75+
[#else RESULT#]
76+
<p align=center>
77+
<div class="alert alert-danger"><#LANG_NO_RECORDS_FOUND#></div>
78+
</p>
79+
[#endif RESULT#]
80+
</div>
81+
</div>
82+
</div>
3683

37-
[#if "<#ACTION#>"=="admin"#]
38-
<a class="btn btn-default btn-sm" href="?view_mode=priority_up&id=[#ID#]"><i class="glyphicon glyphicon-arrow-up"></i></a>
39-
<a class="btn btn-default btn-sm" href="?view_mode=priority_down&id=[#ID#]"><i class="glyphicon glyphicon-arrow-down"></i></a>
40-
41-
<a class="btn btn-default btn-sm" href="?view_mode=edit_locations&id=[#ID#]"><i class="glyphicon glyphicon-pencil"></i></a>
42-
<a class="btn btn-default btn-sm" href="?view_mode=delete_locations&id=[#ID#]" onClick="return confirm('Delete record?')"><i class="glyphicon glyphicon-remove"></i></a>
43-
44-
[#endif ACTION#]
45-
46-
</td>
47-
</tr>
48-
[#end RESULT#]
49-
</table>
50-
<input type="hidden" name="data_source" value="<#DATA_SOURCE#>">
51-
<input type="hidden" name="view_mode" value="multiple_locations">
52-
</form>
53-
<!-- / search results (list) -->
54-
[#else RESULT#]
55-
<p align=center>
56-
<div class="alert alert-danger"><#LANG_NO_RECORDS_FOUND#></div>
57-
</p>
58-
[#endif RESULT#]
59-
<!-- / results -->
84+
<div class="modal fade" id="modalAddLocation" tabindex="-1" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true">
85+
<div class="modal-dialog">
86+
<div class="modal-content">
87+
<div class="modal-header">
88+
<button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
89+
<h4 class="modal-title" id="myModalLabel"><#LANG_ADD_NEW_LOCATION#></h4>
90+
</div>
91+
<div class="modal-body">
92+
<form action="?" method="post" enctype="multipart/form-data" name="frmEdit" class="form-horizontal">
93+
<div class="form-group" style="margin-right: 0px;margin-left: 0px;">
94+
<label class="col-lg-2 col-md-4" style="max-width: 240px;float: left;padding: 5px 10px 0px 0px;text-align: right;"><#LANG_TITLE#>:<font color="red">*</font></label>
95+
<div class="col-lg-10 col-md-8"><input type="text" class="form-control [#if ERR_TITLE#]alert-danger[#endif#]" name="title" value="[#TITLE#]" required="true"></div>
96+
</div>
97+
<div class="form-group" style="margin-right: 0px;margin-left: 0px;">
98+
<label class="col-lg-2 col-md-4" style="max-width: 240px;float: left;padding: 5px 10px 0px 0px;text-align: right;"><#LANG_PRIORITY#>:<font color="red">*</font></label>
99+
<div class="col-lg-10 col-md-8"><input type="text" class="form-control" name="priority" value="[#PRIORITY#]"></div>
100+
</div>
60101

102+
<div class="form-group">
103+
<div class="col-md-12 text-center">
104+
<input type="submit" name="subm" class="btn btn-default btn-success" value="<#LANG_ADD#>">
105+
</div>
106+
</div>
107+
<input type="hidden" name="id" value="<#ID#>">
108+
<input type="hidden" name="view_mode" value="edit_locations">
109+
<input type="hidden" name="edit_mode" value="<#EDIT_MODE#>">
110+
<input type="hidden" name="mode" value="update">
111+
</form>
112+
</div>
113+
<div class="modal-footer">
114+
<button type="button" class="btn btn-default" data-dismiss="modal"><#LANG_CLOSE#></button>
115+
</div>
116+
</div>
117+
</div>
118+
</div>

‎templates/market/list.html

+7-4
Original file line numberDiff line numberDiff line change
@@ -48,17 +48,20 @@ <h4 class="media-heading" style="margin-bottom: 10px;">
4848
[#endif#]
4949
</div>
5050
<div class="col-md-4 text-right" style="margin: auto;">
51+
<div class="btn-group">
5152
[#if CAN_DOWNLOAD="1"#]
52-
[#if SUPPORT_URL !="" AND PRICE != ""#]<a class="btn btn-default" style="border-color: #ffffff;" target="_blank" href="[#SUPPORT_URL#]"><i class="glyphicon glyphicon-bullhorn"></i> <#LANG_NEWMARKET_MODULE_DISCUSS#></a>[#endif#]
53-
<a class="btn btn-[#if INSTALLED_VERSION!="<#PLUGINS.LATEST_VERSION#>"#]success[#else#]warning[#endif#]" style="border-color: #ffffff;" href="<#ROOTHTML#>panel/market.html?mode=iframe&mode2=install&name=[#MODULE_NAME#]">[#if EXISTS#]<i class="glyphicon glyphicon-refresh"></i> [#if INSTALLED_VERSION!="<#PLUGINS.LATEST_VERSION#>"#]<#LANG_UPDATE#>[#else#]Перекачать[#endif#][#else#]<i class="glyphicon glyphicon-download"></i> <#LANG_ADD#>[#endif#]</a>
53+
[#if SUPPORT_URL !="" AND PRICE != ""#]<a class="btn btn-default" target="_blank" href="[#SUPPORT_URL#]"><i class="glyphicon glyphicon-bullhorn"></i> <#LANG_NEWMARKET_MODULE_DISCUSS#></a>[#endif#]
54+
<a class="btn btn-[#if INSTALLED_VERSION!="<#PLUGINS.LATEST_VERSION#>"#]success[#else#]warning[#endif#]" href="<#ROOTHTML#>panel/market.html?mode=iframe&mode2=install&name=[#MODULE_NAME#]">[#if EXISTS#]<i class="glyphicon glyphicon-refresh"></i> [#if INSTALLED_VERSION!="<#PLUGINS.LATEST_VERSION#>"#]<#LANG_UPDATE#>[#else#]Перекачать[#endif#][#else#]<i class="glyphicon glyphicon-download"></i> <#LANG_ADD#>[#endif#]</a>
55+
[#if INSTALLED_VERSION!="<#PLUGINS.LATEST_VERSION#>"#]<a class="btn btn-danger" style="background: #aa22a6;border-color: #8d0789;" onClick="return confirm('<#LANG_ARE_YOU_SURE#>')" href="<#ROOTHTML#>panel/market.html?mode=iframe&mode2=dontupdate&name=[#MODULE_NAME#]&value=[#LATEST_VERSION#]"><i class="glyphicon glyphicon-minus-sign"></i> Не обновлять</a>[#endif#]
5456
[#else#]
5557
[#if PRICE != ""#]
56-
[#if SUPPORT_URL !="" AND PRICE != ""#]<a class="btn btn-default" style="border-color: #ffffff;" target="_blank" href="[#SUPPORT_URL#]"><i class="glyphicon glyphicon-bullhorn"></i> <#LANG_NEWMARKET_MODULE_DISCUSS#></a>[#endif#]
57-
<a class="btn btn-info" style="border-color: #ffffff;" href="[#URL#]" target="_blank"><i class="glyphicon glyphicon-usd"></i> <#LANG_NEWMARKET_BUY_FOR#> [#PRICE#]</a>
58+
[#if SUPPORT_URL !="" AND PRICE != ""#]<a class="btn btn-default" target="_blank" href="[#SUPPORT_URL#]"><i class="glyphicon glyphicon-bullhorn"></i> <#LANG_NEWMARKET_MODULE_DISCUSS#></a>[#endif#]
59+
<a class="btn btn-info" href="[#URL#]" target="_blank"><i class="glyphicon glyphicon-usd"></i> <#LANG_NEWMARKET_BUY_FOR#> [#PRICE#]</a>
5860
[#endif PRICE#]
5961
[#endif#]
6062

6163
[#if EXISTS#]<a class="btn btn-danger" href="<#ROOTHTML#>panel/market.html?mode=iframe&mode2=uninstall&name=[#MODULE_NAME#]" onClick="return confirm('<#LANG_ARE_YOU_SURE#>')"><i class="glyphicon glyphicon-trash"></i> <#LANG_DELETE#></a>[#endif#]
64+
</div>
6265
</div>
6366
</div>
6467
</div>

0 commit comments

Comments
 (0)