Skip to content

Project / eis_sipkd

Go to a project
Commit 42e428a1 by aa.gusti
Options

slide

1 parent 9b842c4e
Inline Side-by-side
Showing 1 changed file with 0 additions and 30 deletions
views/templates/eis-slide/add.pt
...@@ -25,7 +25,6 @@ ...@@ -25,7 +25,6 @@
</div> </div>
</div> </div>
</div> </div>
<<<<<<< HEAD
<div class="col-md-4"> <div class="col-md-4">
<label class="control-label col-md-3"></label> <label class="control-label col-md-3"></label>
<button type="submit" class="btn btn-primary" id="simpan" name="simpan">Simpan</button> <button type="submit" class="btn btn-primary" id="simpan" name="simpan">Simpan</button>
...@@ -42,35 +41,6 @@ ...@@ -42,35 +41,6 @@
} }
</style> </style>
<!-- </div> --> <!-- </div> -->
=======
<div class="col-md-3">
<div class="form-group" tal:define="field form['aktif']" id="item-${field.oid}">
<label for="${field.oid}" class="control-label col-md-6" id="req-${field.oid}">
${field.title}</label>
<div class="col-md-6">
${structure:field.serialize()}
<p id="error-${field.oid}" class="help-block" tal:condition="field.error"
tal:repeat="error field.error.messages()">
${error}</p>
</div>
</div>
</div>
<div class="col-md-3">
<div class="form-group" tal:define="field form['status']" id="item-${field.oid}">
<label for="${field.oid}" class="control-label col-md-4" id="req-${field.oid}">
${field.title}</label>
<div class="col-md-8">
${structure:field.serialize()}
<p id="error-${field.oid}" class="help-block" tal:condition="field.error"
tal:repeat="error field.error.messages()">
${error}</p>
</div>
</div>
</div>
</div>
>>>>>>> 2c4a01303afe7752c4288ff2440e57196df69a0c
<script> <script>
$(document).ready(function(){ $(document).ready(function(){
......
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!