hr edits, css

diff --git a/app/css/drzb2013.css b/app/css/drzb2013.css
index b4aeab4..88ad2c5 100644 (file)
--- a/app/css/drzb2013.css
+++ b/app/css/drzb2013.css
@@ -1,17 +1,19 @@
-
-body {
-       background: #F6F6F6;
-       margin: 0 auto;
-       font-family: Arial;
-       color: #374E5A;
-       font-size: 14px;
-       line-height: 140%;
-       width: 961px;
+body { 
+        background: #F6F6F6;
+        margin: 0 auto;
+        font-family: Arial;
+        color: #374E5A;
+        font-size: 14px;
+        line-height: 140%;
+        width: 961px;
 }
 
-img {
-       border: 0;
+#headerwrapp {
+       clear: both;
+       height: 270px;
 }
+
+
 /* ----- MENU ----- */
 
 #navigation
@@ -85,11 +87,6 @@ img {
        display: block; 
 }
 
-/* Holly Hack. IE Requirement \*/
-* html ul li { float: left; height: 1%; }
-* html ul li a { height: 1%; }
-/* End */
-
 #mainNav_right
 {
        position: relative;
@@ -146,269 +143,47 @@ img {
        display: block;
 }
 
-
-
-label {
-       display: block;
-       color: #D74F25;
-       color: #374E5A;
-       color: #afafaf;
+h1
+{
+       border-bottom: 1px solid #CCCCCC;
        margin-top: 10px;
-       font-size: 14px;
-       font-family: Arial;
-}
-
-.title {
+       margin-bottom: 20px;
+       padding-bottom: 4px;
        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;
-       margin: 0;
-}
-
-
-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: #46C03B;
-       
-}
-
-label {
-       color: #374E5A;
-}
-
-.input, .inputOrg {
-       color: #afafaf;
-       float: left;
-       margin: 2px;
-       padding: 0 6px;
-}
-
-.inputOrg {
-       color:  #374E5A;
-}
-
-.input1 {
-       width: 40.8em;
-}
-
-.input2 {
-       width: 8em;
-}
-
-.input3 {
-       width: 13em;
-}
-.input4 {
-       width: 10em;
-}
-
-.input5 {
-       width: 21.4em;
-}
-.input6 {
-       width: 6.3em;
-}
-
-.clear {
-       clear: both;
-}
-
-
-.authors {
-       clear: both;
-       margin-bottom: 6px;
-}
-
-.addPerson {
-       color: #D74F25;
-       color: #EDC8BC;
-       color: #EAB3A2;
-       font-size: 90%;
-}
-
-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;
-/*     border: 1px solid #46d0fe; */
-}
-
-.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;
-}
-
-
-#work, #submission {
-       margin-bottom: 20px;
-}
-
-.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;
+       background: url(http://mjesec.ffzg.hr/drzb2013/images/kvadrat.gif) no-repeat left;
 }
 
-.gohome a {
-}
-
-.gohome a:hover {
-       text-decoration: none;
-}
-
-.list {
-       margin-top: 20px;
-       font-weight: bold;
+h2 {
+       font-size: 18px;
+       font-weight: normal;
+       margin-top: 40px;
 }
 
-.warrning {
-       color: #FF6666;
+.container {
+        width: 961px;
 }
 
-.sworks {
-       margin-top: 20px;
+fieldset {
+       margin-top: 40px;
 }
 
-
-.newWork {
-       clear: left;
-       margin-top: 50px;
-}
-.saved {
-       margin-bottom: 20px;
-       margin-top: 20px;
-}
-.saved2 {
-       color: #374E5A;
-       color: #d74f25;
+legend, h3 {
+       font-size: 14px;
        font-weight: bold;
-       font-style: italic;
-       display: block;
-}
-.saved3 {
-       color: #374E5A;
-       font-weight: normal;
-       margin-top: 20px;
-}
-#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;
+       line-height: 140%;
+       margin-bottom: 10px;
 }
 
-#foot a:hover
-{
-       color: #374e5a;
-       text-decoration: underline;
+#intro {
+       margin-bottom: 40px;
 }
 
-
 hr {
-       border: 1px solid #ccc;
-}
-.lengthCount {
-       color:red;
+       margin: 10px 0;
 }

diff --git a/app/hr/index.html b/app/hr/index.html
index cfea368..ae36af5 100644 (file)
--- a/app/hr/index.html
+++ b/app/hr/index.html
@@ -2,7 +2,7 @@
 <html lang="en" ng-app="myApp" xmlns:ng="http://angularjs.org">
 <head>
   <meta charset="utf-8">
-  <title>DRZB conference</title>
+  <title>Registracija za konferenciju</title>
 
   <!-- Twtitter bootstrap -->
   <link rel="stylesheet" href="../lib/bootstrap/css/bootstrap.min.css" />
@@ -26,10 +26,12 @@
 
 </head>
 <body>
+<!--
   <ul class="menu">
     <li><a href="#/registration">registation</a></li>
     <li><a href="#/list">list</a></li>
   </ul>
+-->
 
   <!--[if lt IE 8]>
        <div style="color:red">
@@ -44,72 +46,69 @@
        </div>
   <![endif]-->
 
-<div id="wrapper">
+  <div id="headerwrapp">
     <div id="header">
-        <a href="http://psihologija.ffzg.unizg.hr/drzb2013"><img src="http://psihologija.ffzg.unizg.hr/uploads/U5/ee/U5eerH9gxcbVpHDVcDqinA/drzb_header_v8.jpg" alt="Dani Ramira i Zorana Bujasa" class="float_left" /></a>
+       <a href="http://psihologija.ffzg.unizg.hr/drzb2013"><img src="http://psihologija.ffzg.unizg.hr/uploads/U5/ee/U5eerH9gxcbVpHDVcDqinA/drzb_header_v8.jpg" alt="Dani Ramira i Zorana Bujasa" class="float_left" /></a>
     </div>
     <div id="mainNav">
        <div id="navigation">
-       <ul>
-       <li class="level"><a href="http://psihologija.ffzg.unizg.hr/drzb2013">Naslovnica</a></li>
+         <ul>
+               <li class="level"><a href="http://psihologija.ffzg.unizg.hr/drzb2013">Naslovnica</a></li>
                <li>
-               <a class="level4" href="http://psihologija.ffzg.unizg.hr/drzb2013/sudjelovanje">Sudjelovanje</a>
-               <ul>
-
+                 <a class="level4" href="http://psihologija.ffzg.unizg.hr/drzb2013/sudjelovanje">Sudjelovanje</a>
+                 <ul>
                        <li>
-                               <a class="level5" href="http://psihologija.ffzg.unizg.hr/drzb2013/sudjelovanje/oblici">Oblici sudjelovanja</a>
+                               <a class="level5" href="http://psihologija.ffzg.unizg.hr/drzb2013/sudjelovanje/oblici">Oblici sudjelovanja</a></li>
 
                        <li>
-                               <a class="level5" href="http://psihologija.ffzg.unizg.hr/drzb2013/sudjelovanje/pripremasazetaka">Priprema sažetaka</a>
+                               <a class="level5" href="http://psihologija.ffzg.unizg.hr/drzb2013/sudjelovanje/pripremasazetaka">Priprema sažetaka</a></li>
                        <li>
-                               <a class="level5" href="http://psihologija.ffzg.unizg.hr/drzb2013/sudjelovanje/prijava-izlaganja-i-registracija">Prijava izlaganja i registracija</a>
+                               <a class="level5" href="http://psihologija.ffzg.unizg.hr/drzb2013/sudjelovanje/prijava-izlaganja-i-registracija">Prijava izlaganja i registracija</a></li>
                        <li>
-                               <a class="level5" href="http://psihologija.ffzg.unizg.hr/drzb2013/sudjelovanje/kotizacija">Kotizacija</a>
+                               <a class="level5" href="http://psihologija.ffzg.unizg.hr/drzb2013/sudjelovanje/kotizacija">Kotizacija</a></li>
                        <li>
-                               <a class="level5" href="http://psihologija.ffzg.unizg.hr/drzb2013/sudjelovanje/bodovanje">Bodovanje</a>
-
-               </ul>
+                               <a class="level5" href="http://psihologija.ffzg.unizg.hr/drzb2013/sudjelovanje/bodovanje">Bodovanje</a></li>
+                 </ul>
                </li>
                <li>
-               <a class="level4" href="http://psihologija.ffzg.unizg.hr/drzb2013/prijave">Prijave</a>
-
-               <ul>
+                 <a class="level4" href="http://psihologija.ffzg.unizg.hr/drzb2013/prijave">Prijave</a>
+                 <ul>
                        <li>
-                               <a class="level5" href="http://psihologija.ffzg.unizg.hr/drzb2013/prijave/upute">Prijava izlaganja i registracija</a>
+                               <a class="level5" href="http://psihologija.ffzg.unizg.hr/drzb2013/prijave/upute">Prijava izlaganja i registracija</a></li>
 
                        <li>
-                               <a class="level5" href="http://psihologija.ffzg.unizg.hr/drzb2013/obrazac">Obrazac za prijavu</a>
+                               <a class="level5" href="http://psihologija.ffzg.unizg.hr/drzb2013/obrazac">Obrazac za prijavu</a></li>
 
-               </ul>
+                 </ul>
                </li>
        <!--
                <li>
                        <a class="level4" href="http://psihologija.ffzg.unizg.hr/drzb2013/program">Program</a>
        -->
                <li>
-                       <a class="level4" href="http://psihologija.ffzg.unizg.hr/drzb2013/organizacija">Organizacija</a>
+                       <a class="level4" href="http://psihologija.ffzg.unizg.hr/drzb2013/organizacija">Organizacija</a></li>
        <!--
                <li>
                        <a target="_blank" class="level4" href="http://psihologija.ffzg.unizg.hr/drzb2013/smjestaj">Smještaj</a>
        -->
                <li>
-                       <a class="level4" href="http://psihologija.ffzg.unizg.hr/psihofest2013">PsihoFest</a>
-       </ul>
+                       <a class="level4" href="http://psihologija.ffzg.unizg.hr/psihofest2013">PsihoFest</a></li>
+         </ul>
+       </div>
+
+       <div id="mainNav_right">
+               <ul>
+                   <li><a href="http://psihologija.ffzg.unizg.hr/drzb2013" class="active">Hrvatski</a></li>
+                   <li><a href="http://psihologija.ffzg.unizg.hr/drzb2013-eng">English</a></li>
+               </ul>
        </div>
     </div>
-    <div id="mainNav_right">
-        <ul>
-            <li><a href="http://psihologija.ffzg.unizg.hr/drzb2013" class="active">Hrvatski</a></li>
-            <li><a href="http://psihologija.ffzg.unizg.hr/drzb2013-eng">English</a></li>
-        </ul>
-    </div>
-</div>
-<div>
+  </div>
 
   <div class="container" ng-view></div>
-
+<!--
   <div>Angular seed app: v<span app-version></span></div>
-
+-->
   <!-- In production use:
   <script src="//ajax.googleapis.com/ajax/libs/angularjs/1.0.2/angular.min.js"></script>
   -->

diff --git a/app/hr/partials/confirmation.html b/app/hr/partials/confirmation.html
index 2692558..e97bf96 100644 (file)
--- a/app/hr/partials/confirmation.html
+++ b/app/hr/partials/confirmation.html
@@ -1,16 +1,24 @@
+<h1> Registracija i prijavljivanje izlaganja</h1>
 
-<div ng-controller="RegistrationCtrl" name="RegistrationForm">
 
-Registration for
+<div ng-controller="RegistrationCtrl" name="RegistrationForm">
 
+Registracija je uspješno poslana!
+<br/><br/>
+Broj registracije: {{registration.id}}
+<br/><br/>
 {{user.firstname}}
-{{user.surname}}
+{{user.surname}}<br/>
 <span ng-show="user.organization">
-from
 {{user.organization}}
 </span>
-is received, thanks.
+<br/>
+<div class="gohome">
+       <a href="http://psihologija.ffzg.unizg.hr/drzb2013/sudjelovanje/kotizacija">Molimo pročitajte upute za plaćanje kotizacije.</a>
+       <br><br>Potvrdu o plaćenoj kotizaciji molimo pošaljite na adresu <a href="mailto:drzb@ffzg.hr">drzb@ffzg.hr</a>
+</div>
 
+<!--
 <pre>
 user={{user}}
 
@@ -22,7 +30,7 @@ $routeParams={{$routeParams}}
 location={{$location}}
 
 </pre>
-
+-->
 </div>
 
 

diff --git a/app/hr/partials/registration.html b/app/hr/partials/registration.html
index 48e142d..ce42583 100644 (file)
--- a/app/hr/partials/registration.html
+++ b/app/hr/partials/registration.html
@@ -184,7 +184,7 @@ Molimo ispunite sva obavezna polja označena crvenim okvirom.
 </p>
 </div>
 
-
+<!--
 <pre>
 {{RegistrationForm.$valid}}
 {{RegistrationForm.$error}}
@@ -192,6 +192,6 @@ Molimo ispunite sva obavezna polja označena crvenim okvirom.
 location={{$location.path()}}
 
 </pre>
-
+-->
 </form>