bradybod-usu/cs2610hw7
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

moved txt Box

Browse Source
This commit is contained in:
bradybodily
2018-04-27 10:56:23 -06:00
parent 13bea29bc3
commit 48012ac693
2 changed files with 20 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
.idea/workspace.xml generated
View File

@@ -3,7 +3,7 @@
<component name="ChangeListManager"> <component name="ChangeListManager">
<list default="true" id="601f9577-9354-4137-8c6e-f40020b4437a" name="Default" comment=""> <list default="true" id="601f9577-9354-4137-8c6e-f40020b4437a" name="Default" comment="">
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" /> <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/cs2610hw7/urls.py" afterPath="$PROJECT_DIR$/cs2610hw7/urls.py" /> <change type="MODIFICATION" beforePath="$PROJECT_DIR$/main/templates/main/index.html" afterPath="$PROJECT_DIR$/main/templates/main/index.html" />
</list> </list>
<option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" /> <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
<option name="TRACKING_ENABLED" value="true" /> <option name="TRACKING_ENABLED" value="true" />
@@ -18,11 +18,11 @@
<component name="ExecutionTargetManager" SELECTED_TARGET="default_target" /> <component name="ExecutionTargetManager" SELECTED_TARGET="default_target" />
<component name="FileEditorManager"> <component name="FileEditorManager">
<leaf> <leaf>
<file leaf-file-name="index.html" pinned="false" current-in-tab="false"> <file leaf-file-name="index.html" pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/main/templates/main/index.html"> <entry file="file://$PROJECT_DIR$/main/templates/main/index.html">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="200"> <state relative-caret-position="125">
<caret line="18" column="41" lean-forward="false" selection-start-line="18" selection-start-column="41" selection-end-line="18" selection-end-column="41" /> <caret line="13" column="18" lean-forward="false" selection-start-line="13" selection-start-column="18" selection-end-line="13" selection-end-column="18" />
<folding /> <folding />
</state> </state>
</provider> </provider>
@@ -38,11 +38,11 @@
</provider> </provider>
</entry> </entry>
</file> </file>
<file leaf-file-name="urls.py" pinned="false" current-in-tab="true"> <file leaf-file-name="urls.py" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/cs2610hw7/urls.py"> <entry file="file://$PROJECT_DIR$/cs2610hw7/urls.py">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="183"> <state relative-caret-position="258">
<caret line="16" column="37" lean-forward="true" selection-start-line="16" selection-start-column="37" selection-end-line="16" selection-end-column="37" /> <caret line="21" column="41" lean-forward="true" selection-start-line="21" selection-start-column="41" selection-end-line="21" selection-end-column="41" />
<folding> <folding>
<element signature="e#633#665#0" expanded="true" /> <element signature="e#633#665#0" expanded="true" />
</folding> </folding>
@@ -150,9 +150,9 @@
<option value="$PROJECT_DIR$/conversion/serilizer.py" /> <option value="$PROJECT_DIR$/conversion/serilizer.py" />
<option value="$PROJECT_DIR$/main/views.py" /> <option value="$PROJECT_DIR$/main/views.py" />
<option value="$PROJECT_DIR$/conversion/urls.py" /> <option value="$PROJECT_DIR$/conversion/urls.py" />
<option value="$PROJECT_DIR$/main/templates/main/index.html" />
<option value="$PROJECT_DIR$/conversion/views.py" /> <option value="$PROJECT_DIR$/conversion/views.py" />
<option value="$PROJECT_DIR$/cs2610hw7/urls.py" /> <option value="$PROJECT_DIR$/cs2610hw7/urls.py" />
<option value="$PROJECT_DIR$/main/templates/main/index.html" />
</list> </list>
</option> </option>
</component> </component>
@@ -633,7 +633,7 @@
<state relative-caret-position="195"> <state relative-caret-position="195">
<caret line="13" column="56" lean-forward="true" selection-start-line="13" selection-start-column="24" selection-end-line="13" selection-end-column="56" /> <caret line="13" column="56" lean-forward="true" selection-start-line="13" selection-start-column="24" selection-end-line="13" selection-end-column="56" />
<folding> <folding>
<element signature="e#0#35#0" expanded="true" /> <element signature="e#0#35#0" expanded="false" />
</folding> </folding>
</state> </state>
</provider> </provider>
@@ -718,14 +718,6 @@
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/main/templates/main/index.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="200">
<caret line="18" column="41" lean-forward="false" selection-start-line="18" selection-start-column="41" selection-end-line="18" selection-end-column="41" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/conversion/views.py"> <entry file="file://$PROJECT_DIR$/conversion/views.py">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="130"> <state relative-caret-position="130">
@@ -738,13 +730,21 @@
</entry> </entry>
<entry file="file://$PROJECT_DIR$/cs2610hw7/urls.py"> <entry file="file://$PROJECT_DIR$/cs2610hw7/urls.py">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="183"> <state relative-caret-position="258">
<caret line="16" column="37" lean-forward="true" selection-start-line="16" selection-start-column="37" selection-end-line="16" selection-end-column="37" /> <caret line="21" column="41" lean-forward="true" selection-start-line="21" selection-start-column="41" selection-end-line="21" selection-end-column="41" />
<folding> <folding>
<element signature="e#633#665#0" expanded="true" /> <element signature="e#633#665#0" expanded="true" />
</folding> </folding>
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/main/templates/main/index.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="125">
<caret line="13" column="18" lean-forward="false" selection-start-line="13" selection-start-column="18" selection-end-line="13" selection-end-column="18" />
<folding />
</state>
</provider>
</entry>
</component> </component>
</project> </project>

2
main/templates/main/index.html
View File

@@ -12,8 +12,8 @@
</div> </div>
<form> <form>
<input type = "number" step = "%.01" id = "userWeight"/>
<div class="shadowed blue nice-box flex-rows"> <div class="shadowed blue nice-box flex-rows">
<input type = "number" step = "%.01" id = "userWeight"/>
<button type="button" onclick="getConversion()">Calculate!</button> <button type="button" onclick="getConversion()">Calculate!</button>
</div> </div>
<div class= "shadowed red stuff-box flex-rows"> <div class= "shadowed red stuff-box flex-rows">