From: Dobrica Pavlinusic Date: Mon, 6 Dec 2010 22:34:55 +0000 (+0100) Subject: Merge branch 'master' of github.com:dpavlin/angular-mojolicious X-Git-Url: http://git.rot13.org/?p=angular-mojolicious.git;a=commitdiff_plain;h=dcd86315bc5c11a54771ce54f422e7d44c8e52e8;hp=5ef2b86490084b177cd74a4356bfc88ac4bfc769 Merge branch 'master' of github.com:dpavlin/angular-mojolicious --- diff --git a/public/app/casopisi2010/upitnik.css b/public/app/casopisi2010/upitnik.css new file mode 100644 index 0000000..cde7f0a --- /dev/null +++ b/public/app/casopisi2010/upitnik.css @@ -0,0 +1,200 @@ +body { + background: #F6F6F6; + margin: 0 auto; + font-family: Arial; + color: #374E5A; + font-size: 14px; + line-height: 140%; + width: 861px; +} + +h2, h3 { + margin-top: 60px; + font-size: 14px; + padding: 2px 0; + border-bottom: 2px solid #D74F25; + border-bottom: 1px solid #46d0fe; +} + +h3 { + margin-top: 20px; +} + +a { + color: #D74F25; +} + +input, textarea { + font: 14px arial; + color: #000000; + border: solid 1px #dedede; + padding: 6px; + background: #f6f6f6; +} + +input:focus, textarea:focus +{ + background: #ffffff; + font-family: arial; + color: #000000; +} +.input { + color: #afafaf; + float: left; + margin: 2px; + padding: 0 6px; +} + +.text1 { + width: 30em; +} + +img { + border: 0; +} + +label { + display: block; + margin-top: 10px; + font-size: 14px; + font-family: Arial; + color: #afafaf; +} + +.radio { + color: #374E5A; +} + +h1 +{ + float: left; +/* margin-bottom: 6px; */ + padding-left: 20px; + font: 18px arial; + color: #0c1426; + text-align: center; + text-decoration: none; + display: block; + background: url(http://mjesec.ffzg.hr/drzb2011/images/kvadrat.gif) no-repeat left; + margin: 0; +} + + + +.clear { + clear: both; +} + + + +.ng-validation-error { + border: 1px solid #FF6666; + border: 1px solid #EDC8BC; + border: 1px solid #FF9966; + border: 1px solid #EAB3A2; + border: 1px solid #D74F25; + border: 1px solid #DC6844; + border: 1px solid #DE7F61; +} + +.ng-exception { + border: 0; +} + + + +.button { + margin-top: 20px; + width: 40.8em; +} + +.button input { + margin-bottom: 10px; + float: left; + color: #ffffff; + display: block; + text-decoration: none; + background: #d74f25; +} + +.button input:hover, .gohome:hover { + /* background: #dc6844; */ +} + +.button2 input { + background: #F6F6F6; + color: #374E5A; + border: 1px solid #d74f25; + display: inline; +} + + +.gohome { + float: left; + color: #374E5A; + border: 1px solid #d74f25; + text-decoration: none; + background: #f6f6f6; + padding: 7px; + margin-top: 20px; + font: 14px arial; + border: solid 1px #dedede; + border: solid 1px #f6f6f6; +} + +.gohome a { +} + +.gohome a:hover { + text-decoration: none; +} + +.list { + margin-top: 20px; + font-weight: bold; +} + +.warrning { + color: #FF6666; +} + +#footer { + position: relative; + float: left; + width: 961px; + height: 18px; + padding-top: 5px; + margin-top: 180px; + margin-bottom: 20px; + font: 10px arial; + color: #374e5a; + text-align: center; + background: url(http://mjesec.ffzg.hr/drzb2011/images/footer_bg.jpg) repeat-x; + clear: both; +} + +#foot a +{ + position: relative; + top: 12px; + margin-bottom: 20px; + font: 12px arial; + color: #374e5a; + text-align: center; + text-decoration: none; +} + +#foot a:hover +{ + color: #374e5a; + text-decoration: underline; +} + + +hr { + border: 1px solid #ccc; +} + +.lengthCount { + color:red; +} diff --git a/public/app/casopisi2010/upitnik.html b/public/app/casopisi2010/upitnik.html new file mode 100644 index 0000000..29c7981 --- /dev/null +++ b/public/app/casopisi2010/upitnik.html @@ -0,0 +1,80 @@ + + + + + + +Upitnik o stranim časopisima + + + + + + + + +
+ +

+1. Koji su Vam strani časopisi najpotrebniji? +

+
+

Navedite naslove stranih časopisa u kojima nalazite najveći broj članaka potrebnih u Vašem istraživanju i nastavi, koje najčešće citirate ili koje redovito pratite, bez obzira na to da li su Vam sada dostupni ili ne.

+

Navedite barem 3 naslova.

+
+ +
+ +obriši +
+Dodaj još jedan naslov + +

+2. Odaberite i obrazložite svoj izbor: +

+ + + + + + + +

+3. Koji elektronički izvori informacija su Vam potrebni? +

+
+

Navedite poznate Vam digitalne zbirke časopisa, knjiga ili drugih vrsta građe, bibliografske baze podataka i slično.

+
+
+ + obriši +
+Dodaj još jedan izvor + + +
+ + +
+ +
+ +
+
+dirty= invalid={{$invalidWidgets.visible()}}
+
+upitnik = {{upitnik}}
+
+
+
+ +
+ + + diff --git a/public/app/casopisi2010/upitnik.js b/public/app/casopisi2010/upitnik.js new file mode 100644 index 0000000..dba95a4 --- /dev/null +++ b/public/app/casopisi2010/upitnik.js @@ -0,0 +1,49 @@ + +if (typeof (console) === 'undefined') console = { debug: function() {} }; // mock console.debug + +var database = 'casopisi2010'; + +function Upitnik($resource,$xhr){ + this.master = { + casopisi: [{naslov:''},{naslov:''},{naslov:''}], + eizvori: [{naziv:''}] + }; + this.Upitnik = $resource( '/data/:database/Upitnik/:id', { id:'', database: database } ); + this.reset(); + this.$watch('$location.hashPath', this.hash_change); + this.$xhr = $xhr; + console.debug( 'database', database, this.upitnik ); +} +Upitnik.$inject=['$resource','$xhr']; + +Upitnik.prototype = { + hash_change: function() { + var id = this.$location.hashPath; +console.debug( 'hash_change', id, this.upitnik.$id ); + if ( id != this.upitnik.$id ) { + if (id) { + var self = this; + this.Upitnik.get({ id: id }, function(upitnik) { +console.debug('upitnik', id, upitnik); + self.last_saved = angular.copy(upitnik); + self.upitnik = upitnik; // needed for load_symposium below + }); + } + else this.reset(); + } + }, + reset: function() { + console.debug( this.Upitnik ); + this.upitnik = new this.Upitnik( this.master ); +console.debug( 'reset', this.upitnik ); + this.last_saved = this.upitnik; + }, + save: function(){ + var self = this; + this.upitnik.$save(function(upitnik){ + self.$location.hashPath = upitnik.$id; + self.last_saved = angular.copy(upitnik); + }); + } +}; + diff --git a/public/app/drzb2011/registration-en.html b/public/app/drzb2011/registration-en.html index fdcbf36..2f2139e 100644 --- a/public/app/drzb2011/registration-en.html +++ b/public/app/drzb2011/registration-en.html @@ -14,9 +14,64 @@ +
+
+ Dani Ramira i Zorana Bujasa +
+ + + + +
-

Registration and Proposal Submission

+
+

Registration and proposal submission

+
@@ -24,7 +79,7 @@
-
+

All participants (presenters, coauthors and visitors) have to register via on-line register system.

@@ -61,7 +116,7 @@ One person can be author of maximum three papers, only one of them as first/pres
-
+

{{registration.person.name}} {{registration.person.surname}}

+
+ + + diff --git a/public/app/drzb2011/registration-hr.html b/public/app/drzb2011/registration-hr.html index 4181590..5b009a4 100644 --- a/public/app/drzb2011/registration-hr.html +++ b/public/app/drzb2011/registration-hr.html @@ -14,17 +14,70 @@ +
+ + + -

Registracija i prijavljivanje izlaganja

- + + +
+
+

Registracija i prijavljivanje izlaganja

+
-
+

Svi sudionici skupa, bez obzira na to jesu li izlagači, suautori ili slušači, moraju se registrirati kroz sustav elektroničke prijave.

@@ -61,7 +114,7 @@ Jedna osoba može biti autor u najviše tri rada, pri čemu na samo jednom može
-
+

{{registration.person.name}} {{registration.person.surname}}

- -
+
+ - + diff --git a/public/app/drzb2011/registration.css b/public/app/drzb2011/registration.css index 55b0280..3200455 100644 --- a/public/app/drzb2011/registration.css +++ b/public/app/drzb2011/registration.css @@ -1,13 +1,152 @@ body { background: #F6F6F6; - margin: 40px; + margin: 0 auto; font-family: Arial; color: #374E5A; font-size: 14px; - line-height: 16px; + line-height: 140%; + width: 961px; } +img { + border: 0; +} +/* ----- MENU ----- */ + +#navigation +{ + position: relative; + float: left; + text-align: left; + width: 794px; + height: 60px; + font: 16px arial; +/* background: url(http://mjesec.ffzg.hr/drzb2011/images/menu_bg.gif) repeat-x; */ +} + +#navigation ul +{ + list-style: none; + margin: 0; + padding: 0; + list-style: none; + height: 33px; + width: 794px; + border-top: 1px solid #ccc; + border-bottom: 1px solid #ccc; +} + +#navigation ul li { + position: relative; + float: left; + display: inline; + height: 33px; + border-right: 1px solid #ccc; +} + +#navigation li ul { + position: absolute; + left: -50%; + top: 28px; + border: 0; + display: none; +} + +#navigation li ul li { + border: 0; + border-right: 1px solid #ccc; + height: 19px; + margin-top: 10px; +} + +#navigation ul li a { + display: block; + float: left; + text-decoration: none; + color: #777; + background: #f6f6f6; /* IE6 Bug */ + padding: 5px 10px; + height: 23px; +} + +#navigation ul li a:hover { + color: #d74f25; + border-bottom: 1px solid #f6f6f6; +} + + +#navigation li ul li a { + padding: 1px 10px; +} + + +#navigation li:hover ul { + display: block; +} + +/* Holly Hack. IE Requirement \*/ +* html ul li { float: left; height: 1%; } +* html ul li a { height: 1%; } +/* End */ + +#mainNav_right +{ + position: relative; + float: left; + text-align: left; + width: 167px; + height: 33px; + font: 16px arial; + display: block; + border-top: 1px solid #ccc; + border-bottom: 1px solid #ccc; +} + +#mainNav_right ul +{ + display: inline; +} + +#mainNav_right li +{ + display: inline; +} + +#mainNav_right li a +{ + float: left; + height: 27px; + padding-left: 15px; + padding-right: 15px; + padding-top: 6px; + color: #91959c; + text-align: center; + text-decoration: none; + display: block; +} + +#mainNav_right li a:hover +{ + color: #d74f25; + text-decoration: none; + display: block; +} + +#mainNav_right li a.active +{ + float: left; + height: 27px; + padding-left: 15px; + padding-right: 15px; + padding-top: 6px; + text-align: center; + color: #d74f25; + text-decoration: none; + display: block; +} + + label { display: block; @@ -18,16 +157,35 @@ label { font-size: 14px; font-family: Arial; } -h1 { + +.title { + position: relative; + float: left; + text-align: left; + width: 100%; +/* background: url(http://mjesec.ffzg.hr/drzb2011/images/crta.gif) repeat-x bottom; */ + border-bottom: 1px solid #ccc; + padding-bottom: 4px; + margin: 0; + margin-top: 10px; + +} + +h1 +{ + float: left; /* margin-bottom: 6px; */ padding-left: 20px; font: 18px arial; color: #0c1426; + text-align: center; text-decoration: none; display: block; background: url(http://mjesec.ffzg.hr/drzb2011/images/kvadrat.gif) no-repeat left; - border-bottom: 1px solid #CCC; + margin: 0; } + + h2, h3 { margin-top: 60px; font-size: 14px; @@ -214,9 +372,39 @@ input:focus, textarea:focus font-weight: normal; margin-top: 20px; } -.footer { - height: 10px; +#footer { + position: relative; + float: left; + width: 961px; + height: 18px; + padding-top: 5px; + margin-top: 180px; + margin-bottom: 20px; + font: 10px arial; + color: #374e5a; + text-align: center; + background: url(http://mjesec.ffzg.hr/drzb2011/images/footer_bg.jpg) repeat-x; + clear: both; +} + +#foot a +{ + position: relative; + top: 12px; + margin-bottom: 20px; + font: 12px arial; + color: #374e5a; + text-align: center; + text-decoration: none; } + +#foot a:hover +{ + color: #374e5a; + text-decoration: underline; +} + + hr { border: 1px solid #ccc; } diff --git a/public/app/drzb2011/registrations.html b/public/app/drzb2011/registrations.html index cf7c36d..c214aa2 100644 --- a/public/app/drzb2011/registrations.html +++ b/public/app/drzb2011/registrations.html @@ -26,8 +26,8 @@ function Registrations(xhr){ @@ -35,20 +35,41 @@ function Registrations(xhr){
-
    -
  • +SVI
    +Samo registracija
    +Sudionik simpozija/okruglog stola
    +Organizator simpozija
    +Organizator okruglog stola
    +Usmeno priopćenje
    +Poster
    +Student - samo registracija
    +Osoba u pratnji
    + + +
      +
    1. +{{registration.type}} - student
      {{registration.person.name}} {{registration.person.surname}} <{{registration.person.email}}>
      {{registration.person.inst}}
      +
      {{registration.work.title}}
      + +{{author.name}} +{{author.surname}} ; + +
      2. -
+ +
 data={{data}}
+