wcrisman/AVEF
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Disabled the internship header edit button because I cannot figure out what I was intending to do with it; Moved the page editor's save button to the upper right corner of the page (may want to move it over the bottom right corner of the screen instead?); Changed the position of the logout icon slightly and gave it a tool tip.

Browse Source
This commit is contained in:
Wynne Crisman
2019-01-06 10:43:33 -08:00
parent 3fc374eda3
commit 0593c2421a
10 changed files with 22 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
.meteor/versions
View File

@@ -7,7 +7,7 @@ aldeed:template-extension@4.1.0
allow-deny@1.1.0 allow-deny@1.1.0
arillo:flow-router-helpers@0.5.2 arillo:flow-router-helpers@0.5.2
autoupdate@1.5.0 autoupdate@1.5.0
babel-compiler@7.2.3 babel-compiler@7.2.4
babel-runtime@1.3.0 babel-runtime@1.3.0
base64@1.0.11 base64@1.0.11
binary-heap@1.0.11 binary-heap@1.0.11
@@ -28,7 +28,7 @@ ddp-server@2.2.0
deps@1.0.12 deps@1.0.12
diff-sequence@1.1.1 diff-sequence@1.1.1
dynamic-import@0.5.1 dynamic-import@0.5.1
ecmascript@0.12.3 ecmascript@0.12.4
ecmascript-runtime@0.7.0 ecmascript-runtime@0.7.0
ecmascript-runtime-client@0.8.0 ecmascript-runtime-client@0.8.0
ecmascript-runtime-server@0.7.1 ecmascript-runtime-server@0.7.1
@@ -85,7 +85,7 @@ mobile-status-bar@1.0.14
modern-browsers@0.1.3 modern-browsers@0.1.3
modules@0.13.0 modules@0.13.0
modules-runtime@0.10.3 modules-runtime@0.10.3
momentjs:moment@2.22.2 momentjs:moment@2.23.0
mongo@1.6.0 mongo@1.6.0
mongo-decimal@0.1.0 mongo-decimal@0.1.0
mongo-dev-server@1.1.0 mongo-dev-server@1.1.0
@@ -102,7 +102,7 @@ ostrio:logger@2.0.7
ostrio:loggermongo@2.0.4 ostrio:loggermongo@2.0.4
ostrio:meteor-root@1.0.7 ostrio:meteor-root@1.0.7
poorvavyas:es6-shim@0.21.1 poorvavyas:es6-shim@0.21.1
promise@0.11.1 promise@0.11.2
raix:eventemitter@0.1.3 raix:eventemitter@0.1.3
random@1.1.0 random@1.1.0
rate-limit@1.0.9 rate-limit@1.0.9

2
client/head.html
View File

@@ -1,5 +1,5 @@
<head> <head>
<title>*Anderson Valley Education Foundation</title> <title>Anderson Valley Education Foundation</title>
<!--<meta http-equiv="content-type" content="text/html; charset=UTF8">--> <!--<meta http-equiv="content-type" content="text/html; charset=UTF8">-->
<meta name="viewport" content="width=device-width, initial-scale=1"> <meta name="viewport" content="width=device-width, initial-scale=1">
<meta charset="UTF8"> <meta charset="UTF8">

2
imports/ui/Admin/InternshipEditor.html
View File

@@ -1,7 +1,7 @@
<template name="InternshipEditor"> <template name="InternshipEditor">
<div id="internshipEditor"> <div id="internshipEditor">
<div class="internshipNavigation"> <div class="internshipNavigation">
<div class="addInternship"><input type="text" name="newInternshipName" class="newInternshipName form-control"/><i class="fa fa-plus-circle createInternship noselect clickable" aria-hidden="true"></i></div><span class="editPageText noselect clickable"><i class="fa fa-pencil" aria-hidden="true"></i><br/>Header</span> <div class="addInternship"><input type="text" name="newInternshipName" class="newInternshipName form-control"/><i class="fa fa-plus-circle createInternship noselect clickable" aria-hidden="true"></i></div><!--<span class="editPageText noselect clickable"><i class="fa fa-pencil" aria-hidden="true"></i><br/>Header</span>-->
<ul class="internshipList"> <ul class="internshipList">
{{#each internships}} {{#each internships}}

2
imports/ui/Admin/InternshipEditor.js
View File

@@ -37,7 +37,7 @@ Template.InternshipEditor.events({
Session.set(PREFIX + "selectedInternship", Meteor.collections.Internship.findOne($li.data('id'))); Session.set(PREFIX + "selectedInternship", Meteor.collections.Internship.findOne($li.data('id')));
}, },
'click .editPageText': function(event,template) { 'click .editPageText': function(event,template) {
//
}, },
"keyup input[name='newInternshipName']" : function(event, template) { "keyup input[name='newInternshipName']" : function(event, template) {
if(event.keyCode === 13) { if(event.keyCode === 13) {

3
imports/ui/Admin/PageEditor.html
View File

@@ -6,8 +6,7 @@
</div> </div>
{{/if}} {{/if}}
<h1>{{editorName}} Editor</h1> <div><button id="save">Save</button><h1>{{editorName}} Editor</h1></div>
<div class="editor"></div> <div class="editor"></div>
<button id="save">Save</button>
</div> </div>
</template> </template>

12
imports/ui/Admin/PageEditor.import.styl vendored
View File

@@ -1,6 +1,14 @@
#boardEditor #pageEditor
display: block display: block
.ck.ck-editor__editable_inline .ck.ck-editor__editable_inline
border-color: rgba(0,0,0,.2) border-color: rgba(0,0,0,.2)
.ck.ck-editor__editable_inline.ck-focused .ck.ck-editor__editable_inline.ck-focused
border-color: rgba(0,0,0,1) border-color: rgba(0,0,0,1)
h1
display: inline-block
button#save
float: right
padding: 6px 10px
font-size: 16px
font-weight: 800
cursor: pointer

2
imports/ui/layouts/Admin.html
View File

@@ -5,7 +5,7 @@
<a href="javascript:" class="fa fa-bars leftSidebarMenuButton generalMenuButton" aria-hidden="true"></a> <a href="javascript:" class="fa fa-bars leftSidebarMenuButton generalMenuButton" aria-hidden="true"></a>
<div class="leftSidebar"> <div class="leftSidebar">
<div class="logoArea"> <div class="logoArea">
<i class="fa fa-sign-out fa-2x signOut" aria-hidden="true"></i> <i class="fa fa-sign-out fa-2x signOut" aria-hidden="true" title="Log Out"></i>
<div class="logo"><img src="/images/logo_v1.png" height="60px"/></div> <div class="logo"><img src="/images/logo_v1.png" height="60px"/></div>
</div> </div>
<div class="menuArea generalMenu"> <div class="menuArea generalMenu">

2
imports/ui/layouts/Admin.import.styl vendored
View File

@@ -103,7 +103,7 @@
.signOut .signOut
position: absolute position: absolute
left: 10px left: 10px
top: 10px top: 70px
color: white color: white
cursor: pointer cursor: pointer
.signOut:hover .signOut:hover

5
package-lock.json generated
View File

@@ -297,11 +297,6 @@
"resolved": "https://registry.npmjs.org/atoa/-/atoa-1.0.0.tgz", "resolved": "https://registry.npmjs.org/atoa/-/atoa-1.0.0.tgz",
"integrity": "sha1-DMDpGkgOc4+SPrwQNnZHF3mzSkk=" "integrity": "sha1-DMDpGkgOc4+SPrwQNnZHF3mzSkk="
}, },
"b64-to-blob": {
"version": "1.2.19",
"resolved": "https://registry.npmjs.org/b64-to-blob/-/b64-to-blob-1.2.19.tgz",
"integrity": "sha512-L3nSu8GgF4iEyNYakCQSfL2F5GI5aCXcot9mNTf+4N0/BMhpxqqHyOb6jIR24iq2xLjQZLG8FOt3gnUcV+9NVg=="
},
"base64-js": { "base64-js": {
"version": "1.3.0", "version": "1.3.0",
"resolved": "https://registry.npmjs.org/base64-js/-/base64-js-1.3.0.tgz", "resolved": "https://registry.npmjs.org/base64-js/-/base64-js-1.3.0.tgz",

3
package.json
View File

@@ -3,7 +3,8 @@
"private": true, "private": true,
"scripts": { "scripts": {
"start": "meteor run", "start": "meteor run",
"build": "npm install --product && meteor build --architecture os.linux.x86_64 --server-only ../" "build": "npm install --product && meteor build --architecture os.linux.x86_64 --server-only ../",
"mongodump": "mongodump -h 127.0.0.1 --port 3001 -d meteor"
}, },
"dependencies": { "dependencies": {
"@babel/runtime": "latest", "@babel/runtime": "latest",