-
Notifications
You must be signed in to change notification settings - Fork 12
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Interface revisions (presenter & audience)
Trying to clean up for Apple Store App submision
- Loading branch information
1 parent
1e2b908
commit 39388aa
Showing
21 changed files
with
335 additions
and
100 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,5 @@ | ||
| header .brand img { | ||
| /* margin: 0 0 5px 0; */ | ||
| position: absolute; | ||
| left: 0; | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,41 @@ | ||
| <template name="_editDeckBar"> | ||
| <div class="media"> | ||
| <div class="pull-left thumbnail" style="margin-right: 10px;"> | ||
| <div class="btn-group"> | ||
| <a href="/deckEdit/{{_id}}" class="btn btn-mini"><i class="icon-edit"></i> Edit</a> | ||
| {{#if isOpen}} | ||
| <a href="/deck/{{_id}}" class="btn btn-mini btn-primary"><i class="icon-play icon-white"></i> View/Start</a> | ||
| {{else}} | ||
| <a href="/deck/{{_id}}" class="btn btn-mini btn-info"><i class="icon-search icon-white"></i> Preview</a> | ||
| {{/if}} | ||
| </div> | ||
| | ||
| <br> | ||
| {{#if slidesCount}} | ||
| <span class="label label-info"><i class="icon-ok icon-white"></i> has {{slidesCount}} slides</span> | ||
| {{else}} | ||
| <span class="label label-warning"><i class="icon-remove icon-white"></i> no slides</span> | ||
| {{/if}} | ||
| <br> | ||
| {{#if isOpen}} | ||
| <a href="#" data-id="{{_id}}" class="deckClose label label-success" data-toggle="tooltip" title="Deck is open, ready to connect to... click to change"><i class="icon-ok icon-white"></i> Open</a> | ||
| {{else}} | ||
| <a href="#" data-id="{{_id}}" class="deckOpen label label-warning"><i class="icon-remove icon-white"></i> Closed</a> | ||
| {{/if}} | ||
| <br> | ||
| {{#if isFindable}} | ||
| <a href="#" data-id="{{_id}}" class="deckHide" data-toggle="tooltip" title="Deck is Findable/visible, click to change"><i class="icon-eye-open"></i> Visible</a> | ||
| {{else}} | ||
| <a href="#" data-id="{{_id}}" class="deckFindable" data-toggle="tooltip" title="Deck is hidden, click to change"><i class="icon-lock"></i> Invisible</a> | ||
| {{/if}} | ||
| </div> | ||
| <div class="media-body"> | ||
| <h4 style="margin:0;"> | ||
| <span class="eip" data-type="text" data-mode="inline" data-name="title" data-pk="{{_id}}">{{title}}</span> | ||
| </h4> | ||
| <div class="muted eip" data-type="textarea" data-mode="inline" data-name="short" data-pk="{{_id}}">{{safe 'short'}}</div> | ||
| <br> | ||
| <span class="label">created: {{createdNice}}</span> | ||
| </div> | ||
| </div> | ||
| </template> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,94 @@ | ||
| Template._editDeckBar.events({ | ||
| // open a deck, done on server, as a call example | ||
| // this relies on Meteor.methods() defined in server/methods.js | ||
| 'click .deckOpen': function(event) { | ||
| var deckId = _(event).eventGetA().data('id'); | ||
| var deck = Decks.findOne({ _id: deckId}); | ||
| if (! (_.isObject(deck) && deck.owner == Meteor.userId())) { | ||
| Notify.alert('Access denied, you are not the owner'); | ||
| return false; | ||
| } | ||
| Meteor.call('deckOpen', deckId); | ||
| return false; | ||
| }, | ||
| // close a deck, done on server, as a call example | ||
| 'click .deckClose': function(event) { | ||
| var deckId = _(event).eventGetA().data('id'); | ||
| var deck = Decks.findOne({ _id: deckId}); | ||
| if (! (_.isObject(deck) && deck.owner == Meteor.userId())) { | ||
| Notify.alert('Access denied, you are not the owner'); | ||
| return false; | ||
| } | ||
| Meteor.call('deckClose', deckId); | ||
| return false; | ||
| }, | ||
| // make findable, done on client->server, as an example | ||
| // this relies on Decks.allow defined in the models/decks.js | ||
| 'click .deckFindable': function(event) { | ||
| var deckId = _(event).eventGetA().data('id'); | ||
| var deck = Decks.findOne({ _id: deckId}); | ||
| if (! (_.isObject(deck) && deck.owner == Meteor.userId())) { | ||
| Notify.alert('Access denied, you are not the owner'); | ||
| return false; | ||
| } | ||
| Decks.update( { _id: deckId }, { $set: { isFindable: true } } ); | ||
| return false; | ||
| }, | ||
| // make not-findable, done on client->server, as an example | ||
| // this relies on Decks.allow defined in the models/decks.js | ||
| 'click .deckHide': function(event) { | ||
| var deckId = _(event).eventGetA().data('id'); | ||
| var deck = Decks.findOne({ _id: deckId}); | ||
| console.log('deckHide', event, deckId, deck, Meteor.userId()); | ||
| if (! (_.isObject(deck) && deck.owner == Meteor.userId())) { | ||
| Notify.alert('Access denied, you are not the owner'); | ||
| return false; | ||
| } | ||
| Decks.update( { _id: deckId }, { $set: { isFindable: false } } ); | ||
| return false; | ||
| }, | ||
|
|
||
| }); | ||
|
|
||
| Template._editDeckBar.helpers({ | ||
| decks: function() { | ||
| return Decks.find({ owner: Meteor.userId() }); | ||
| }, | ||
| createdNice: function() { | ||
| return moment(this.created).fromNow(); | ||
| }, | ||
| slidesCount: function() { | ||
| Session.set('slideIdAlt', this._id); | ||
| return Slides.find({ deckId: this._id }).count(); | ||
| } | ||
| }); | ||
|
|
||
| Template._editDeckBar.rendered = function() { | ||
| // setup which changes as slides re-render/change | ||
| if (_.isObject(Template.decksMine.autorunner)) { | ||
| Template._editDeckBar.autorunner.stop(); | ||
| } | ||
| Template._editDeckBar.autorunner = Deps.autorun(function() { | ||
| var mydecks = Decks.find({ owner: Meteor.userId() }).count(); | ||
| if (mydecks == 0) { | ||
| return false; | ||
| } | ||
| // setup in-place | ||
| $('.eip').each(function(i, el) { | ||
| $(el).editable({ | ||
| value: $(el).html(), | ||
| url: function(params) { | ||
| var d = new $.Deferred; | ||
| var deck = {}; | ||
| deck[params.name] = params.value; | ||
| console.log('editable', params, deck, _.isObject(deck)); | ||
| var updated = Decks.update({ _id: params.pk }, { $set: deck }); | ||
| console.log('editable-done', updated); | ||
| return d.resolve(); | ||
| } | ||
| }); | ||
| }); | ||
| }); | ||
| }; | ||
|
|
||
|
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,16 @@ | ||
| <template name="about"> | ||
| <h1>About Presenteract</h1> | ||
| <p class="lead">Presenteract is a project to facilitate interactive presentations, where the audience can see and interact with slides from their phone/device/laptop.</p> | ||
| <h2>Audience</h2> | ||
| <p>Connect to the currently "open" deck, for this presentaiton. Often there is a QR code or a URL provided to make this simpler.</p> | ||
| <p>Wait for the Presenter to change slides for you.</p> | ||
| <p>Polls should be very simple, just choose an option and submit.</p> | ||
| <h2>Presenters</h2> | ||
| <p>To present, you must login, via Facebook or via Google. Once logged in, you'll have an option for "My Presentations" and the ability to add new ones.</p> | ||
| <p>New Deck/Presenations will be created without any slides. You must add at least one slide to be able to use it.</p> | ||
| <p>Only "Open" Presenations are available to audience members. You can edit Presenations while open, and audience members should get your changes automatically synced.</p> | ||
| <p>Only the "owner" / "creator" of a Presenation can control/run it.</p> | ||
| <h2>Help / Contact</h2> | ||
| <p><a href="https://github.com/zeroasterisk/Presenteract/issues">Bug Reports and Feature Requests</a> are available. If there is a significant need, we will improve this to a knowledge base.</p> | ||
| <p>Developers, the code is available on <a href="https://github.com/zeroasterisk/Presenteract">GitHub</a></p> | ||
| </template> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.