Skip to content

Commit ce6fde9

Browse files
author
hooray
committed
更新日历应用，更新icon
1 parent d59c8c2 commit ce6fde9

File tree

16 files changed

+102
-88
lines changed

16 files changed

+102
-88
lines changed

‎index.php‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -327,7 +327,6 @@
327327
</div>
328328
</div>
329329
<script src="//cdn.bootcss.com/jquery/2.2.4/jquery.min.js"></script>
330-
<script src="//cdn.bootcss.com/sugar/2.0.4/sugar.min.js"></script>
331330
<script src="//cdn.bootcss.com/sweetalert/1.1.3/sweetalert.min.js"></script>
332331
<script src="static/plugins/HoorayLibs/hooraylibs.js"></script>
333332
<script src="static/plugins/Validform_v5.3.2/Validform_v5.3.2_min.js"></script>

‎sysapp/account/index.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@
7272
<a href="<?php echo $member['openurl_weibo']; ?>" target="_blank">
7373
<img src="<?php echo $member['openavatar_weibo']; ?>" class="img-circle img-thumbnail" width="36" height="36">
7474
<?php echo $member['openname_weibo']; ?>
75-
<i class="icon-share"></i>
75+
<i class="glyphicon glyphicon-share"></i>
7676
</a>
7777
<a href="javascript:;" class="btn btn-default unbind" data-type="weibo">解除绑定</a>
7878
<?php }else{ ?>

‎sysapp/appmanage/detail.php‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -158,9 +158,9 @@
158158
</div>
159159
</div>
160160
<div class="bottom-bar">
161-
<a class="btn btn-default" id="btn-preview" href="javascript:;"><i class="icon-eye-open"></i> 预览应用</a>
162-
<a class="btn btn-primary pull-right" id="btn-submit" href="javascript:;"><i class="icon-white icon-ok"></i> 确定</a>
163-
<a class="btn btn-default pull-right" href="javascript:window.parent.closeDetailIframe();" style="margin-right:10px"><i class="icon-chevron-up"></i> 返回应用列表</a>
161+
<a class="btn btn-default" id="btn-preview" href="javascript:;"><i class="glyphicon glyphicon-eye-open"></i> 预览应用</a>
162+
<a class="btn btn-primary pull-right" id="btn-submit" href="javascript:;"><i class="glyphicon glyphicon-ok"></i> 确定</a>
163+
<a class="btn btn-default pull-right" href="javascript:window.parent.closeDetailIframe();" style="margin-right:10px"><i class="glyphicon glyphicon-chevron-up"></i> 返回应用列表</a>
164164
</div>
165165
</form>
166166
<div id="unpassinfo" class="form-inline hide">

‎sysapp/appmanage/index.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@
3737
<div id="toorbar">
3838
<div class="form-inline">
3939
<div class="form-group">
40-
<a class="btn btn-primary" href="javascript:openDetailIframe('detail.php');"><i class="icon-white icon-plus"></i> 添加新应用</a>
40+
<a class="btn btn-primary" href="javascript:openDetailIframe('detail.php');"><i class="glyphicon glyphicon-plus"></i> 添加新应用</a>
4141
</div>
4242
<div class="form-group">
4343
<label class="control-label">分类：</label>

‎sysapp/calendar/index.ajax.php‎

Lines changed: 26 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -93,26 +93,34 @@
9393
}
9494
break;
9595
case 'edit':
96-
$data = [
97-
'title' => $_POST['val_title'],
98-
'startdt' => $_POST['val_startdt'],
99-
'enddt' => $_POST['val_enddt'],
100-
'url' => $_POST['val_url'],
101-
'content' => $_POST['val_content'],
102-
'isallday' => $_POST['val_isallday'],
103-
'member_id' => session('member_id')
104-
];
105-
if($_POST['id'] == ''){
106-
$db->insert('tb_calendar', $data);
96+
if(strtotime($_POST['val_startdt']) <= strtotime($_POST['val_enddt'])){
97+
$data = [
98+
'title' => $_POST['val_title'],
99+
'startdt' => $_POST['val_startdt'],
100+
'enddt' => $_POST['val_enddt'],
101+
'url' => $_POST['val_url'],
102+
'content' => $_POST['val_content'],
103+
'isallday' => isset($_POST['val_isallday']) ? 1 : 0,
104+
'member_id' => session('member_id')
105+
];
106+
if($_POST['id'] == ''){
107+
$db->insert('tb_calendar', $data);
108+
}else{
109+
$db->update('tb_calendar', $data, [
110+
'tbid' => $_POST['id']
111+
]);
112+
}
113+
$rs = [
114+
'info' => '',
115+
'status' => 'y'
116+
];
107117
}else{
108-
$db->update('tb_calendar', $data, [
109-
'tbid' => $_POST['id']
110-
]);
118+
$rs = [
119+
'info' => '时间选择有误，请检查',
120+
'status' => 'n'
121+
];
111122
}
112-
echo json_encode([
113-
'info' => '',
114-
'status' => 'y'
115-
]);
123+
echo json_encode($rs);
116124
break;
117125
}
118126
?>

‎sysapp/calendar/index.php‎

Lines changed: 57 additions & 49 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
<label for="inputName" class="col-sm-2 control-label">日程标题：</label>
2929
<div class="col-sm-10">
3030
<input type="text" class="form-control" name="val_title" datatype="*" nullmsg="请填写日程标题">
31-
<span class="help-inline errormsg"></span>
31+
<span class="help-block"></span>
3232
</div>
3333
</div>
3434
<div class="form-group">
@@ -40,7 +40,7 @@
4040
<span class="input-group-addon">结束</span>
4141
<input type="text" class="form-control" name="val_enddt" style="text-align:center" datatype="*" nullmsg="请填写完整日期">
4242
</div>
43-
<span class="help-inline errormsg"></span>
43+
<span class="help-block"></span>
4444
</div>
4545
</div>
4646
<div class="form-group">
@@ -72,7 +72,6 @@
7272
</div>
7373
<div id="calendar" style="margin:30px"></div>
7474
<?php include('sysapp/global_js.php'); ?>
75-
<script src="//cdn.bootcss.com/sugar/2.0.4/sugar.min.js"></script>
7675
<script src="//cdn.bootcss.com/moment.js/2.18.1/moment.min.js"></script>
7776
<script src="//cdn.bootcss.com/fullcalendar/3.4.0/fullcalendar.min.js"></script>
7877
<script src="//cdn.bootcss.com/fullcalendar/3.4.0/locale/zh-cn.js"></script>
@@ -89,68 +88,78 @@
8988
//cssctl:内置的提示信息样式控制函数，该函数需传入两个参数：显示提示信息的对象 和 当前提示的状态（既形参o中的type）;
9089
tiptype: function(msg, o){
9190
if(!o.obj.is('form')){//验证表单元素时o.obj为该表单元素，全部验证通过提交表单时o.obj为该表单对象;
92-
var B = o.obj.parents('.control-group');
93-
var T = B.children('.errormsg');
91+
var B = o.obj.parents('.form-group');
92+
var T = B.find('.help-block');
9493
if(o.type == 2){
95-
B.removeClass('error');
94+
B.removeClass('has-error');
9695
T.text('');
9796
}else{
98-
B.addClass('error');
97+
B.addClass('has-error');
9998
T.text(msg);
10099
}
101100
}
102101
},
103102
ajaxPost: true,
104-
callback: function(){
105-
$('#calendar').show();
106-
$('#editbox').hide();
107-
$('#calendar').fullCalendar('refetchEvents');
103+
callback: function(data){
104+
if(data.status == 'y'){
105+
$('#calendar').show();
106+
$('#editbox').hide();
107+
$('#calendar').fullCalendar('refetchEvents');
108+
}else{
109+
swal({
110+
type: 'error',
111+
title: '警告',
112+
text: data.info,
113+
timer: 2000,
114+
showConfirmButton: false
115+
});
116+
}
108117
}
109118
});
110-
$('input[name="val_isallday"]').on('switchChange.bootstrapSwitch', function(event, state) {
119+
$('#editbox input[name="val_isallday"]').on('switchChange.bootstrapSwitch', function(event, state) {
111120
var startdt = $('input[name="val_startdt"]').val();
112121
var enddt = $('input[name="val_enddt"]').val();
113122
$('input[name="val_startdt"]').datetimepicker('remove');
114123
$('input[name="val_enddt"]').datetimepicker('remove');
115124
if(state){
116125
$('input[name="val_startdt"]').datetimepicker({
117-
language : 'zh-CN',
118-
format : 'yyyy-mm-dd',
119-
weekStart : 1,
120-
startView : 2,
121-
minView : 2,
122-
todayBtn : true,
123-
todayHighlight : true
126+
language: 'zh-CN',
127+
format: 'yyyy-mm-dd',
128+
weekStart: 1,
129+
startView: 2,
130+
minView: 2,
131+
todayBtn: true,
132+
todayHighlight: true
124133
});
125134
$('input[name="val_enddt"]').datetimepicker({
126-
language : 'zh-CN',
127-
format : 'yyyy-mm-dd',
128-
weekStart : 1,
129-
startView : 2,
130-
minView : 2,
131-
todayBtn : true,
132-
todayHighlight : true
135+
language: 'zh-CN',
136+
format: 'yyyy-mm-dd',
137+
weekStart: 1,
138+
startView: 2,
139+
minView: 2,
140+
todayBtn: true,
141+
todayHighlight: true
133142
});
134143
$('input[name="val_startdt"]').val(moment(startdt).format('YYYY-MM-DD'));
135144
$('input[name="val_enddt"]').val(moment(startdt).format('YYYY-MM-DD'));
136145
}else{
137146
$('input[name="val_startdt"]').datetimepicker({
138-
language : 'zh-CN',
139-
format : 'yyyy-mm-dd hh:ii',
140-
weekStart : 1,
141-
startView : 2,
142-
minView : 0,
143-
todayBtn : true,
144-
todayHighlight : true
147+
language: 'zh-CN',
148+
format: 'yyyy-mm-dd hh:ii',
149+
weekStart: 1,
150+
startView: 2,
151+
minView: 0,
152+
todayBtn: true,
153+
todayHighlight: true
145154
});
146155
$('input[name="val_enddt"]').datetimepicker({
147-
language : 'zh-CN',
148-
format : 'yyyy-mm-dd hh:ii',
149-
weekStart : 1,
150-
startView : 2,
151-
minView : 0,
152-
todayBtn : true,
153-
todayHighlight : true
156+
language: 'zh-CN',
157+
format: 'yyyy-mm-dd hh:ii',
158+
weekStart: 1,
159+
startView: 2,
160+
minView: 0,
161+
todayBtn: true,
162+
todayHighlight: true
154163
});
155164
$('input[name="val_startdt"]').val(moment(startdt).format('YYYY-MM-DD HH:mm'));
156165
$('input[name="val_enddt"]').val(moment(enddt).format('YYYY-MM-DD HH:mm'));
@@ -208,10 +217,10 @@
208217
});
209218
}else{
210219
swal({
211-
type : 'error',
212-
title : '请填写活动标题',
213-
showConfirmButton : false,
214-
timer : 1000
220+
type: 'error',
221+
title: '请填写活动标题',
222+
showConfirmButton: false,
223+
timer: 1000
215224
});
216225
return false;
217226
}
@@ -228,13 +237,13 @@
228237
//初始化表单
229238
$('#editbox input[name="val_title"]').val(document.getElementById('title').value);
230239
if(isallday == 0){
240+
$('#editbox input[name="val_isallday"]').bootstrapSwitch('state', false);
231241
$('#editbox input[name="val_startdt"]').val(start.format('YYYY-MM-DD HH:mm'));
232242
$('#editbox input[name="val_enddt"]').val(end.format('YYYY-MM-DD HH:mm'));
233-
$('#editbox input[name="val_isallday"]').bootstrapSwitch('state', false);
234243
}else{
244+
$('#editbox input[name="val_isallday"]').bootstrapSwitch('state', true);
235245
$('#editbox input[name="val_startdt"]').val(start.format('YYYY-MM-DD'));
236246
$('#editbox input[name="val_enddt"]').val(end.format('YYYY-MM-DD'));
237-
$('#editbox input[name="val_isallday"]').bootstrapSwitch('state', true);
238247
}
239248
}
240249
}
@@ -320,13 +329,13 @@
320329
$('#editbox input[name="val_url"]').val(msg['url']);
321330
$('#editbox textarea[name="val_content"]').val(msg['content']);
322331
if(msg['isallday'] == '1'){
332+
$('#editbox input[name="val_isallday"]').bootstrapSwitch('state', true);
323333
$('#editbox input[name="val_startdt"]').val(moment(msg['startdt']).format('YYYY-MM-DD'));
324334
$('#editbox input[name="val_enddt"]').val(moment(msg['enddt']).format('YYYY-MM-DD'));
325-
$('#editbox input[name="val_isallday"]').bootstrapSwitch('state', true);
326335
}else{
336+
$('#editbox input[name="val_isallday"]').bootstrapSwitch('state', false);
327337
$('#editbox input[name="val_startdt"]').val(moment(msg['startdt']).format('YYYY-MM-DD HH:mm'));
328338
$('#editbox input[name="val_enddt"]').val(moment(msg['enddt']).format('YYYY-MM-DD HH:mm'));
329-
$('#editbox input[name="val_isallday"]').bootstrapSwitch('state', false);
330339
}
331340
}
332341
});
@@ -384,7 +393,6 @@ function getMyDay(day){
384393
function clearEditForm(){
385394
$('#editbox input[name="id"], #editbox input[name="val_title"], #editbox input[name="val_url"]').val('');
386395
$('#editbox input[name="val_startdt"], #editbox input[name="val_enddt"]').val('');
387-
$('#editbox input[name="val_isallday"]').bootstrapSwitch('state', true);
388396
$('#editbox textarea[name="val_content"]').val('');
389397
}
390398
</script>

‎sysapp/category/detail.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,8 +46,8 @@
4646
</div>
4747
</div>
4848
<div class="bottom-bar">
49-
<a class="btn btn-primary pull-right" id="btn-submit" href="javascript:;"><i class="icon-white icon-ok"></i> 确定</a>
50-
<a class="btn btn-default pull-right" href="javascript:window.parent.closeDetailIframe();" style="margin-right:10px"><i class="icon-chevron-up"></i> 返回类目列表</a>
49+
<a class="btn btn-primary pull-right" id="btn-submit" href="javascript:;"><i class="glyphicon glyphicon-ok"></i> 确定</a>
50+
<a class="btn btn-default pull-right" href="javascript:window.parent.closeDetailIframe();" style="margin-right:10px"><i class="glyphicon glyphicon-chevron-up"></i> 返回类目列表</a>
5151
</div>
5252
</form>
5353
<?php include('sysapp/global_js.php'); ?>

‎sysapp/category/index.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
</head>
2929
<body>
3030
<div id="toorbar">
31-
<a class="btn btn-primary" href="javascript:openDetailIframe('detail.php');"><i class="icon-white icon-plus"></i> 创建新类目</a>
31+
<a class="btn btn-primary" href="javascript:openDetailIframe('detail.php');"><i class="glyphicon glyphicon-plus"></i> 创建新类目</a>
3232
</div>
3333
<table id="table"></table>
3434
<?php include('sysapp/global_module_detailIframe.php'); ?>

‎sysapp/dialog/app.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -114,8 +114,8 @@
114114
</div>
115115
</div>
116116
<div class="bottom-bar">
117-
<a class="btn btn-primary pull-right" id="btn-submit" href="javascript:;"><i class="icon-white icon-ok"></i> 确定</a>
118-
<a class="btn btn-default pull-right" href="javascript:window.parent.dialog.get('editdialog').close().remove();" style="margin-right:10px"><i class="icon-remove"></i> 关闭</a>
117+
<a class="btn btn-primary pull-right" id="btn-submit" href="javascript:;"><i class="glyphicon glyphicon-ok"></i> 确定</a>
118+
<a class="btn btn-default pull-right" href="javascript:window.parent.dialog.get('editdialog').close().remove();" style="margin-right:10px"><i class="glyphicon glyphicon-remove"></i> 关闭</a>
119119
</div>
120120
</form>
121121
<?php include('sysapp/global_js.php'); ?>

‎sysapp/dialog/papp.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -141,8 +141,8 @@
141141
</div>
142142
</div>
143143
<div class="bottom-bar">
144-
<a class="btn btn-primary pull-right" id="btn-submit" href="javascript:;"><i class="icon-white icon-ok"></i> 确定</a>
145-
<a class="btn btn-default pull-right" href="javascript:window.parent.dialog.get('editdialog').close().remove();" style="margin-right:10px"><i class="icon-remove"></i> 关闭</a>
144+
<a class="btn btn-primary pull-right" id="btn-submit" href="javascript:;"><i class="glyphicon glyphicon-ok"></i> 确定</a>
145+
<a class="btn btn-default pull-right" href="javascript:window.parent.dialog.get('editdialog').close().remove();" style="margin-right:10px"><i class="glyphicon glyphicon-remove"></i> 关闭</a>
146146
</div>
147147
</form>
148148
<?php include('sysapp/global_js.php'); ?>

0 commit comments

Comments
 (0)