slide

.gitignore

+# Byte-compiled / optimized / DLL files
+__pycache__/
+*.py[cod]
+*$py.class
+
+# C extensions
+*.so
+
+# Distribution / packaging
+.Python
+env/
+build/
+develop-eggs/
+dist/
+downloads/
+eggs/
+.eggs/
+lib/
+lib64/
+parts/
+sdist/
+var/
+wheels/
+*.egg-info/
+.installed.cfg
+*.egg
+
+# PyInstaller
+#  Usually these files are written by a python script from a template
+#  before PyInstaller builds the exe, so as to inject date/other infos into it.
+*.manifest
+*.spec
+
+# Installer logs
+pip-log.txt
+pip-delete-this-directory.txt
+
+# Unit test / coverage reports
+htmlcov/
+.tox/
+.coverage
+.coverage.*
+.cache
+nosetests.xml
+coverage.xml
+*,cover
+.hypothesis/
+
+# Translations
+*.mo
+*.pot
+
+# Django stuff:
+*.log
+local_settings.py
+
+# Flask stuff:
+instance/
+.webassets-cache
+
+# Scrapy stuff:
+.scrapy
+
+# Sphinx documentation
+docs/_build/
+
+# PyBuilder
+target/
+
+# Jupyter Notebook
+.ipynb_checkpoints
+
+# pyenv
+.python-version
+
+# celery beat schedule file
+celerybeat-schedule
+
+# SageMath parsed files
+*.sage.py
+
+# dotenv
+.env
+
+# virtualenv
+.venv
+venv/
+ENV/
+
+# Spyder project settings
+.spyderproject
+
+# Rope project settings
+.ropeproject
+*.ini

views/templates/eis-slide/add.pt

@@ -25,6 +25,7 @@
               </div>
           </div>
         </div>
+<<<<<<< HEAD
         <div class="col-md-4"> 
           <label class="control-label col-md-3"></label>
           <button type="submit" class="btn btn-primary" id="simpan" name="simpan">Simpan</button>
@@ -41,6 +42,35 @@
   }
 </style>
 <!-- </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>
 $(document).ready(function(){