perbaikan template

1 parent 365852ac
...@@ -224,7 +224,7 @@ ...@@ -224,7 +224,7 @@
} }
</script> </script>
<!--?<script src="${home}/static/js/jquery-ui-1.10.3.min.js"></script>--> <!--?<script src="${home}/static/js/jquery-ui-1.10.3.min.js"></script>-->
<script> <script language="javascript">
// if (!window.jQuery.ui) { // if (!window.jQuery.ui) {
<!--? document.write('<script src="${home}/static/js/libs/jquery-ui-1.10.3.min.js"><\/script>');--> <!--? document.write('<script src="${home}/static/js/libs/jquery-ui-1.10.3.min.js"><\/script>');-->
// } // }
......
...@@ -15,17 +15,17 @@ ...@@ -15,17 +15,17 @@
<title tal:content="request.title" /> <title tal:content="request.title" />
<!-- Basic Styles --> <!-- Basic Styles -->
<link rel="stylesheet" type="text/css" media="screen" href="${home}/static/v3/css/bootstrap.min.css"> <link rel="stylesheet" type="text/css" media="screen" href="${home}/static/css/bootstrap.min.css">
<link rel="stylesheet" type="text/css" media="screen" href="${home}/static/v3/css/font-awesome.min.css"> <link rel="stylesheet" type="text/css" media="screen" href="${home}/static/css/font-awesome.min.css">
<!-- SmartAdmin Styles : Caution! DO NOT change the order --> <!-- SmartAdmin Styles : Caution! DO NOT change the order -->
<link rel="stylesheet" type="text/css" media="screen" <link rel="stylesheet" type="text/css" media="screen"
href="${home}/static/v3/css/smartadmin-production-plugins.min.css"> href="${home}/static/css/smartadmin-production-plugins.min.css">
<link rel="stylesheet" type="text/css" media="screen" href="${home}/static/v3/css/smartadmin-production.min.css"> <link rel="stylesheet" type="text/css" media="screen" href="${home}/static/css/smartadmin-production.min.css">
<link rel="stylesheet" type="text/css" media="screen" href="${home}/static/v3/css/smartadmin-skins.min.css"> <link rel="stylesheet" type="text/css" media="screen" href="${home}/static/css/smartadmin-skins.min.css">
<!-- SmartAdmin RTL Support --> <!-- SmartAdmin RTL Support -->
<link rel="stylesheet" type="text/css" media="screen" href="${home}/static/v3/css/smartadmin-rtl.min.css"> <link rel="stylesheet" type="text/css" media="screen" href="${home}/static/css/smartadmin-rtl.min.css">
<link rel="stylesheet" type="text/css" href="${home}/static/css/custom.css"> <link rel="stylesheet" type="text/css" href="${home}/static/css/custom.css">
</head> </head>
......
...@@ -14,17 +14,17 @@ ...@@ -14,17 +14,17 @@
<title>Logout</title> <title>Logout</title>
<!-- Basic Styles --> <!-- Basic Styles -->
<link rel="stylesheet" type="text/css" media="screen" href="${home}/static/v3/css/bootstrap.min.css"> <link rel="stylesheet" type="text/css" media="screen" href="${home}/static/css/bootstrap.min.css">
<link rel="stylesheet" type="text/css" media="screen" href="${home}/static/v3/css/font-awesome.min.css"> <link rel="stylesheet" type="text/css" media="screen" href="${home}/static/css/font-awesome.min.css">
<!-- SmartAdmin Styles : Caution! DO NOT change the order --> <!-- SmartAdmin Styles : Caution! DO NOT change the order -->
<link rel="stylesheet" type="text/css" media="screen" <link rel="stylesheet" type="text/css" media="screen"
href="${home}/static/v3/css/smartadmin-production-plugins.min.css"> href="${home}/static/css/smartadmin-production-plugins.min.css">
<link rel="stylesheet" type="text/css" media="screen" href="${home}/static/v3/css/smartadmin-production.min.css"> <link rel="stylesheet" type="text/css" media="screen" href="${home}/static/css/smartadmin-production.min.css">
<link rel="stylesheet" type="text/css" media="screen" href="${home}/static/v3/css/smartadmin-skins.min.css"> <link rel="stylesheet" type="text/css" media="screen" href="${home}/static/css/smartadmin-skins.min.css">
<!-- SmartAdmin RTL Support --> <!-- SmartAdmin RTL Support -->
<link rel="stylesheet" type="text/css" media="screen" href="${home}/static/v3/css/smartadmin-rtl.min.css"> <link rel="stylesheet" type="text/css" media="screen" href="${home}/static/css/smartadmin-rtl.min.css">
<link rel="stylesheet" type="text/css" href="${home}/static/css/home.css"> <link rel="stylesheet" type="text/css" href="${home}/static/css/home.css">
</head> </head>
......
<div tal:define="css_class css_class|field.widget.css_class; <div tal:define="css_class css_class|field.widget.css_class;
oid oid|field.oid; oid oid|field.oid;
style style|field.widget.style; style style|field.widget.style;
......
...@@ -2,15 +2,13 @@ ...@@ -2,15 +2,13 @@
css_class css_class|field.widget.css_class; css_class css_class|field.widget.css_class;
oid oid|field.oid; oid oid|field.oid;
style style|field.widget.style; style style|field.widget.style;
" " tal:omit-tag="">
tal:omit-tag="">
<img style="height:30px; width:auto; margin-bottom:5px;" src="${cstruct}"> <img style="height:30px; width:auto; margin-bottom:5px;" src="${cstruct}">
<input type="text" name="${name}" value="" <input type="text" name="${name}" value="" tal:attributes="class string: form-control ${css_class or ''};
tal:attributes="class string: form-control ${css_class or ''};
style style; style style;
attributes|field.widget.attributes|{};" attributes|field.widget.attributes|{};" id="${oid}" />
id="${oid}"/> <script lang="javascript">
<script> // Convert input to uppercase
deform.addCallback( deform.addCallback(
'${oid}', '${oid}',
function (oid) { function (oid) {
...@@ -20,6 +18,6 @@ ...@@ -20,6 +18,6 @@
}); });
}); });
}); });
</script> </script>
</span> </span>
\ No newline at end of file \ No newline at end of file
<form <form tal:define="style style|field.widget.style;
tal:define="style style|field.widget.style;
css_class css_class|string:${field.widget.css_class or field.css_class or ''}; css_class css_class|string:${field.widget.css_class or field.css_class or ''};
item_template item_template|field.widget.item_template; item_template item_template|field.widget.item_template;
autocomplete autocomplete|field.autocomplete; autocomplete autocomplete|field.autocomplete;
...@@ -11,25 +10,18 @@ ...@@ -11,25 +10,18 @@
ajax_options ajax_options|field.ajax_options; ajax_options ajax_options|field.ajax_options;
formid formid|field.formid; formid formid|field.formid;
action action|field.action or None; action action|field.action or None;
method method|field.method;" method method|field.method;" tal:attributes="autocomplete autocomplete;
tal:attributes="autocomplete autocomplete;
style style; style style;
class css_class; class css_class;
action action; action action;
attributes|field.widget.attributes|{};" attributes|field.widget.attributes|{};" id="${formid}" method="${method}" enctype="multipart/form-data"
id="${formid}" accept-charset="utf-8" class="deform ${field.bootstrap_form_style | 'form-horizontal'}" i18n:domain="deform">
method="${method}"
enctype="multipart/form-data"
accept-charset="utf-8"
class="deform ${field.bootstrap_form_style | 'form-horizontal'}"
i18n:domain="deform"
>
<!--osipkdForm Widgets--> <!--osipkdForm Widgets-->
<fieldset class="deform-form-fieldset"> <fieldset class="deform-form-fieldset">
<div class="row"> <div class="row">
<legend tal:condition="title">${title}</legend> <legend tal:condition="title">${title}</legend>
<input type="hidden" name="_charset_"/> <input type="hidden" name="_charset_" />
<input type="hidden" name="__formid__" value="${formid}"/> <input type="hidden" name="__formid__" value="${formid}" />
<div class="alert alert-danger" tal:condition="field.error"> <div class="alert alert-danger" tal:condition="field.error">
<div class="error-msg-lbl" i18n:translate="">There was a problem with your submission</div> <div class="error-msg-lbl" i18n:translate="">There was a problem with your submission</div>
<div class="error-msg-detail" i18n:translate="">Errors have been highlighted below</div> <div class="error-msg-detail" i18n:translate="">Errors have been highlighted below</div>
...@@ -38,33 +30,23 @@ ...@@ -38,33 +30,23 @@
<p class="section first" tal:condition="description"> <p class="section first" tal:condition="description">
${description} ${description}
</p> </p>
<div tal:repeat="child field" <div tal:repeat="child field" tal:replace="structure child.render_template(item_template)" />
tal:replace="structure child.render_template(item_template)"/>
</div> </div>
<div class="row"> <div class="row">
<div class="form-group deform-form-buttons"> <div class="form-group deform-form-buttons">
<tal:loop tal:repeat="button buttons"> <tal:loop tal:repeat="button buttons">
<button <button tal:define="btn_disposition repeat.button.start and 'btn-primary' or 'btn-default';"
tal:define="btn_disposition repeat.button.start and 'btn-primary' or 'btn-default';"
tal:attributes="disabled button.disabled if button.disabled else None; tal:attributes="disabled button.disabled if button.disabled else None;
attributes|button.attributes|{};" attributes|button.attributes|{};" id="${formid+button.name}" name="${button.name}"
id="${formid+button.name}" type="${button.type}" class="btn ${button.css_class or btn_disposition}" value="${button.value}"
name="${button.name}"
type="${button.type}"
class="btn ${button.css_class or btn_disposition}"
value="${button.value}"
tal:condition="button.type != 'link'"> tal:condition="button.type != 'link'">
<span tal:condition="button.icon" class="glyphicon glyphicon-${button.icon}"></span> <span tal:condition="button.icon" class="glyphicon glyphicon-${button.icon}"></span>
${button.title} ${button.title}
</button> </button>
<a <a tal:define="btn_disposition repeat.button.start and 'btn-primary' or 'btn-default';
tal:define="btn_disposition repeat.button.start and 'btn-primary' or 'btn-default'; btn_href button.value|''" class="btn ${button.css_class or btn_disposition}"
btn_href button.value|''" id="${field.formid + button.name}" href="${btn_href}" tal:condition="button.type == 'link'">
class="btn ${button.css_class or btn_disposition}"
id="${field.formid + button.name}"
href="${btn_href}"
tal:condition="button.type == 'link'">
<span tal:condition="button.icon" class="glyphicon glyphicon-${button.icon}"></span> <span tal:condition="button.icon" class="glyphicon glyphicon-${button.icon}"></span>
${button.title} ${button.title}
</a> </a>
...@@ -97,11 +79,8 @@ ...@@ -97,11 +79,8 @@
} }
} }
}; };
var extra_options = ${ajax_options} || var extra_options = ${ ajax_options }| {};
{ $('#' + oid).ajaxForm($.extend(options, extra_options)); <!-- TAL Expression: This line initializes the AJAX form using jQuery's ajaxForm plugin, merging the default options with any extra options provided via the TAL variable ajax_options. -->
}
;
$('#' + oid).ajaxForm($.extend(options, extra_options));
} }
); );
</script> </script>
......
...@@ -227,7 +227,7 @@ ...@@ -227,7 +227,7 @@
else param_ajax = o${tableid}Url; else param_ajax = o${tableid}Url;
o${tableid} = $('#${tableid}').DataTable({ o${tableid} = $('#${tableid}').DataTable({
scrollX: ${ field.scroll_x }, scrollX: ${field.scroll_x},
//scrollY: ${field.scroll_y}, //scrollY: ${field.scroll_y},
//dom: '<"row"<"col-md-8"<"toolbar">Bl><"col-md-4"fr>>tip', //dom: '<"row"<"col-md-8"<"toolbar">Bl><"col-md-4"fr>>tip',
dom: '<"row"<"col-md-8"<"toolbar">>><"row"<"col-md-8"Bl><"col-md-4"fr>>t<"row dt-footer"<"col-md-8" i><"col-md-4"p>>', dom: '<"row"<"col-md-8"<"toolbar">>><"row"<"col-md-8"Bl><"col-md-4"fr>>t<"row dt-footer"<"col-md-8" i><"col-md-4"p>>',
......
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!