Skip to content

M
mcotton-v1
Commit 42461746 by Hao Chen
Options

change footer info

parent 1583e8ec
Showing with 186 additions and 37 deletions
.idea/workspace.xml
...@@ -2,9 +2,9 @@ ...@@ -2,9 +2,9 @@
<project version="4"> <project version="4">
<component name="ChangeListManager"> <component name="ChangeListManager">
<list default="true" id="2e5af44c-1b55-4cba-bd4e-692506760c8b" name="Default" comment=""> <list default="true" id="2e5af44c-1b55-4cba-bd4e-692506760c8b" name="Default" comment="">
<change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/start_mcotton.sh" />
<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$/Dockerfile" afterPath="$PROJECT_DIR$/Dockerfile" /> <change type="MODIFICATION" beforePath="$PROJECT_DIR$/Dockerfile" afterPath="$PROJECT_DIR$/Dockerfile" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/app/client/templates/includes/footer.html" afterPath="$PROJECT_DIR$/app/client/templates/includes/footer.html" />
</list> </list>
<ignored path="mcotton-v1.iws" /> <ignored path="mcotton-v1.iws" />
<ignored path=".idea/workspace.xml" /> <ignored path=".idea/workspace.xml" />
...@@ -27,18 +27,48 @@ ...@@ -27,18 +27,48 @@
<file leaf-file-name="Dockerfile" pinned="false" current-in-tab="false"> <file leaf-file-name="Dockerfile" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/Dockerfile"> <entry file="file://$PROJECT_DIR$/Dockerfile">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="270"> <state relative-caret-position="255">
<caret line="18" column="36" lean-forward="true" selection-start-line="18" selection-start-column="6" selection-end-line="18" selection-end-column="36" /> <caret line="17" column="108" lean-forward="true" selection-start-line="17" selection-start-column="108" selection-end-line="17" selection-end-column="108" />
<folding /> <folding />
</state> </state>
</provider> </provider>
</entry> </entry>
</file> </file>
<file leaf-file-name="start_mcotton.sh" pinned="false" current-in-tab="true"> <file leaf-file-name="home.html" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/app/client/templates/home/home.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="0">
<caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
<folding />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="home.js" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/app/client/templates/home/home.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="296">
<caret line="56" column="14" lean-forward="true" selection-start-line="56" selection-start-column="14" selection-end-line="56" selection-end-column="14" />
<folding />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="footer.html" pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/app/client/templates/includes/footer.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="315">
<caret line="21" column="14" lean-forward="true" selection-start-line="21" selection-start-column="14" selection-end-line="21" selection-end-column="14" />
<folding />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="start_mcotton.sh" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/start_mcotton.sh"> <entry file="file://$PROJECT_DIR$/start_mcotton.sh">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="30"> <state relative-caret-position="45">
<caret line="2" column="102" lean-forward="true" selection-start-line="2" selection-start-column="102" selection-end-line="2" selection-end-column="102" /> <caret line="3" column="78" lean-forward="false" selection-start-line="3" selection-start-column="78" selection-end-line="3" selection-end-column="78" />
<folding /> <folding />
</state> </state>
</provider> </provider>
...@@ -88,8 +118,9 @@ ...@@ -88,8 +118,9 @@
<option value="$PROJECT_DIR$/app/client/templates/home/home.js" /> <option value="$PROJECT_DIR$/app/client/templates/home/home.js" />
<option value="$PROJECT_DIR$/.env" /> <option value="$PROJECT_DIR$/.env" />
<option value="$PROJECT_DIR$/README.md" /> <option value="$PROJECT_DIR$/README.md" />
<option value="$PROJECT_DIR$/Dockerfile" />
<option value="$PROJECT_DIR$/start_mcotton.sh" /> <option value="$PROJECT_DIR$/start_mcotton.sh" />
<option value="$PROJECT_DIR$/Dockerfile" />
<option value="$PROJECT_DIR$/app/client/templates/includes/footer.html" />
</list> </list>
</option> </option>
</component> </component>
...@@ -139,6 +170,112 @@ ...@@ -139,6 +170,112 @@
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT> </PATH_ELEMENT>
</PATH> </PATH>
<PATH>
<PATH_ELEMENT>
<option name="myItemId" value="mcotton-v1" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="mcotton-v1" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="app" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
</PATH>
<PATH>
<PATH_ELEMENT>
<option name="myItemId" value="mcotton-v1" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="mcotton-v1" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="app" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="client" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
</PATH>
<PATH>
<PATH_ELEMENT>
<option name="myItemId" value="mcotton-v1" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="mcotton-v1" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="app" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="client" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="templates" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
</PATH>
<PATH>
<PATH_ELEMENT>
<option name="myItemId" value="mcotton-v1" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="mcotton-v1" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="app" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="client" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="templates" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="includes" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
</PATH>
<PATH>
<PATH_ELEMENT>
<option name="myItemId" value="mcotton-v1" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="mcotton-v1" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="app" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="client" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="templates" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="home" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
</PATH>
</subPane> </subPane>
</pane> </pane>
</panes> </panes>
...@@ -248,12 +385,12 @@ ...@@ -248,12 +385,12 @@
<updated>1470845079618</updated> <updated>1470845079618</updated>
<workItem from="1481118331939" duration="4176000" /> <workItem from="1481118331939" duration="4176000" />
<workItem from="1481163956581" duration="23000" /> <workItem from="1481163956581" duration="23000" />
<workItem from="1481164370400" duration="7180000" /> <workItem from="1481164370400" duration="7492000" />
</task> </task>
<servers /> <servers />
</component> </component>
<component name="TimeTrackingManager"> <component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="11379000" /> <option name="totallyTimeSpent" value="11691000" />
</component> </component>
<component name="ToolWindowManager"> <component name="ToolWindowManager">
<frame x="54" y="23" width="1276" height="777" extended-state="0" /> <frame x="54" y="23" width="1276" height="777" extended-state="0" />
...@@ -352,20 +489,6 @@ ...@@ -352,20 +489,6 @@
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/app/client/templates/home/home.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="296">
<caret line="56" column="14" lean-forward="true" selection-start-line="56" selection-start-column="14" selection-end-line="56" selection-end-column="14" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/client/templates/home/home.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="0">
<caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/.gitignore"> <entry file="file://$PROJECT_DIR$/.gitignore">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="15"> <state relative-caret-position="15">
...@@ -401,18 +524,42 @@ ...@@ -401,18 +524,42 @@
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/start_mcotton.sh">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="45">
<caret line="3" column="78" lean-forward="false" selection-start-line="3" selection-start-column="78" selection-end-line="3" selection-end-column="78" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/Dockerfile"> <entry file="file://$PROJECT_DIR$/Dockerfile">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="270"> <state relative-caret-position="255">
<caret line="18" column="36" lean-forward="true" selection-start-line="18" selection-start-column="6" selection-end-line="18" selection-end-column="36" /> <caret line="17" column="108" lean-forward="true" selection-start-line="17" selection-start-column="108" selection-end-line="17" selection-end-column="108" />
<folding /> <folding />
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/start_mcotton.sh"> <entry file="file://$PROJECT_DIR$/app/client/templates/home/home.html">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="30"> <state relative-caret-position="0">
<caret line="2" column="102" lean-forward="true" selection-start-line="2" selection-start-column="102" selection-end-line="2" selection-end-column="102" /> <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/client/templates/home/home.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="296">
<caret line="56" column="14" lean-forward="true" selection-start-line="56" selection-start-column="14" selection-end-line="56" selection-end-column="14" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/client/templates/includes/footer.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="315">
<caret line="21" column="14" lean-forward="true" selection-start-line="21" selection-start-column="14" selection-end-line="21" selection-end-column="14" />
<folding /> <folding />
</state> </state>
</provider> </provider>
......
Dockerfile
...@@ -15,6 +15,6 @@ ENV LC_ALL en_US.UTF-8 ...@@ -15,6 +15,6 @@ ENV LC_ALL en_US.UTF-8
RUN curl -sL https://install.meteor.com | /bin/sh RUN curl -sL https://install.meteor.com | /bin/sh
RUN mkdir /data && cd /data && git clone https://git.microduino.cn/mCotton/mcotton-v1.git && cd mcotton-v1 RUN mkdir /data && cd /data && git clone https://git.microduino.cn/mCotton/mcotton-v1.git && cd mcotton-v1
# RUN meteor update --allow-superuser --all-packages && meteor npm install RUN meteor update --allow-superuser --all-packages && meteor npm install && meteor npm install --save bcrypt
# RUN meteor reset --allow-superuser
# RUN MONGO_URL=mongodb://mongodb/mcotton_v1 mqttDbUrl=mongodb://mongodb/mqtt meteor --allow-superuser --release 1.4.2.3 # RUN MONGO_URL=mongodb://mongodb/mcotton_v1 mqttDbUrl=mongodb://mongodb/mqtt meteor --allow-superuser --release 1.4.2.3
\ No newline at end of file
app/client/templates/includes/footer.html
...@@ -4,9 +4,9 @@ ...@@ -4,9 +4,9 @@
<div class="col-sm-3 bootcards-cards text-left"> <div class="col-sm-3 bootcards-cards text-left">
<h3>Sites</h3> <h3>Sites</h3>
<ul> <ul>
<li>English Site: <a href="http://microduino.cc">microduino.cc</a></li> <li>English Site: <a href="https://www.microduino.cc">microduino.cc</a></li>
<li>中文站: <a href="http://microduino.cn">microduino.cn</a></li> <li>中文站: <a href="https://www.microduino.cn">microduino.cn</a></li>
<li>mCotton: <a href="http://mcotton.microduino.cn">mCotton.microduino.cn</a></li> <li>mCotton: <a href="https://mcotton.microduino.cn">mCotton.microduino.cn</a></li>
</ul> </ul>
</div> </div>
<div class="col-sm-3 bootcards-cards text-left"> <div class="col-sm-3 bootcards-cards text-left">
...@@ -16,14 +16,14 @@ ...@@ -16,14 +16,14 @@
<li><a href="https://plus.google.com/u/0/communities/117933845827174624649" <li><a href="https://plus.google.com/u/0/communities/117933845827174624649"
target="_blank">Google+</a> target="_blank">Google+</a>
</li> </li>
<li><a href="http://www.twitter.com/Microduino" target="_blank">Twitter</a></li> <li><a href="https://www.twitter.com/Microduino" target="_blank">Twitter</a></li>
<li><a href="http://wiki.Microduino.cc" target="_blank">Wiki</a></li> <li><a href="https://wiki.Microduino.cc" target="_blank">Wiki</a></li>
</ul> </ul>
</div> </div>
</div> </div>
<div class="row text-center"> <div class="row text-center">
<div class="copyright"><span>© Microduino Inc. 2012-2015. All rights reserved.</span></div> <div class="copyright"><span>© Microduino Inc. 2012-2016. All rights reserved.</span></div>
<div class="copyright"><span>© 美科科技有限公司. 2012-2015. 版权所有.</span> <div class="copyright"><span>© 美科科技有限公司. 2012-2016. 版权所有.</span>
<a href="http://www.miibeian.gov.cn" target="_blank">京ICP备15050568号</a></div> <a href="http://www.miibeian.gov.cn" target="_blank">京ICP备15050568号</a></div>
</div> </div>
</template> </template>
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment