Merge branch 'master' of github.com:dpavlin/angular-mojolicious

diff --git a/public/app/drzb2011/abstracts.html b/public/app/drzb2011/abstracts.html
index 89f9a45..e3a3a22 100644 (file)
--- a/public/app/drzb2011/abstracts.html
+++ b/public/app/drzb2011/abstracts.html
@@ -114,13 +114,21 @@ Odabir: <br/>
        <span ng:show="registration.student == thrue"> - student</span><br>
 -->
 
-       <h1 style="font-size: 14pt; text-align: center; padding-top:48pt">{{registration.work.title | uppercase}}</h1>
        <span ng:repeat="author in registration.work.authors" ng:show="registration.work.title">
-               <div style="font-size: 12pt; font-weight: bold; text-align: center; margin: 0; padding: 0">{{author.name}} {{author.surname}}</div>
-               <div style="font-size: 12pt; font-style: italic; font-weight: normal; text-align: center; padding-top: 6pt; padding-bottom: 12pt; margin: 0;">{{author.inst}}</div>
-       </span>
+               <span style="font-size: 12pt; font-weight: bold; margin: 0; padding-top: 46pt; display: inline;">{{author.name}} {{author.surname}}</span>, 
+               <span style="font-size: 12pt; font-style: italic; font-weight: normal; margin: 0; display: inline;">{{author.inst}}</span>,</span>
+       <h1 style="font-size: 14pt; text-align: center; padding-bottom: 14pt">{{registration.work.title}}</h1>
+<!--
        <div>{{registration.work.abstract | lf2p | html}}</div>
+-->
+       <div>{{registration.work.abstract}}</div>
+       <div>{{symposium.abstract}}</div>
+       <p>&nbsp;</p>
+       <p>&nbsp;</p>
+       <p>&nbsp;</p>
+<!--
        <div>{{registration._id}}</div>
+-->
 </div>
 </div>
 

diff --git a/public/app/drzb2011/registration-hr.html b/public/app/drzb2011/registration-hr.html
index 97e99df..9fa0b60 100644 (file)
--- a/public/app/drzb2011/registration-hr.html
+++ b/public/app/drzb2011/registration-hr.html
@@ -456,6 +456,7 @@ Odlučite o dolasku na domjenak.</span>
 Permalink to <a href="#{{registration.$id}}">DRZB2011 registration</a> which you can bookmark
 </div>
 -->
+<!--
 <div style="clear: both">
 <input type=checkbox name=debug style="float: left; clear: both">
 <pre ng:show="debug">
@@ -474,6 +475,7 @@ $id={{$id}}
 registration.$id={{registration.$id}}
 </pre>
 </div>
+-->
 
 </body>
 </html>

diff --git a/public/app/drzb2011/registrations.html b/public/app/drzb2011/registrations.html
index 8a2d62b..f900b35 100644 (file)
--- a/public/app/drzb2011/registrations.html
+++ b/public/app/drzb2011/registrations.html
@@ -115,7 +115,7 @@ Odabir: <br/>
 {{registration.person.name}}
 {{registration.person.surname}}
 &lt;{{registration.person.email}}&gt; {{registration.person.inst}}, {{registration.person.city}}, {{registration.person.country}}
-
+<div>{{registration.symposium.title}}<br>{{registration.symposium.abstract}}</div>
 <div><b>{{registration.work.title}}</b></div>
 <span ng:repeat="author in registration.work.authors" ng:show="registration.work.title">
 {{author.name}}

diff --git a/public/app/reservations/calendar.html b/public/app/reservations/calendar.html
index a7c13b7..5dec238 100644 (file)
--- a/public/app/reservations/calendar.html
+++ b/public/app/reservations/calendar.html
@@ -70,6 +70,9 @@ function Calendar($xhr,$resource,$log){
 <title>Reservations</title>
 
 <style>
+li {
+       margin-bottom: 1em;
+}
 </style>
 
 </head>
@@ -84,12 +87,18 @@ function Calendar($xhr,$resource,$log){
 <ul>
 <li ng:repeat="c in data.events" ng:show="reservation.status == 'event'">
 {{c.DTSTART}} - {{c.DTEND}}
-<a href="" ng:click="select_event(c)" ng:show="! reservation.event && c.UID != reservation.event.UID">{{c.SUMMARY}}</a>
-<b ng:show="reservation.event && reservation.event.UID == c.UID">{{c.SUMMARY}}</b>
-<em ng:show="submited[c.UID]">
-broj prijava: {{submited[c.UID]}}
-</em>
-<em ng:show="c.slots">/{{c.slots}}</em>
+
+<span ng:show="! submited[c.UID] || submited[c.UID] < c.slots">
+ <a href="" ng:click="select_event(c)">{{c.SUMMARY}}</a>
+ <em ng:show="submited[c.UID]">prijava: {{submited[c.UID]}}</em>
+ <em ng:show="c.slots">mjesta: {{c.slots}}</em>
+</span>
+
+<span ng:show="submited[c.UID] >= c.slots">
+ <b>{{c.SUMMARY}}</b>
+ <em>popunjena sva mjesta: {{c.slots}}</em>
+</span>
+
 <div>{{c.LOCATION}}</div>
 <div ng:show="c.DESCRIPTION">
 {{c.DESCRIPTION}}

diff --git a/run.sh b/run.sh
index 2800ea5..0c87da2 100755 (executable)
--- a/run.sh
+++ b/run.sh
@@ -7,5 +7,5 @@ if [ ! -z "$1" ] ; then
        test -f public/angular/build/angular.js || ( cd public/angular && rake compile )
 fi
 
-morbo ./angular-server.pl --listen 'http://*:3001'
+./common/mojo/script/morbo ./angular-server.pl --listen 'http://*:3001'