diff --git a/app/Resources/views/ojsheader.html.twig b/app/Resources/views/ojsheader.html.twig index afd62fd0e..8d0e64866 100644 --- a/app/Resources/views/ojsheader.html.twig +++ b/app/Resources/views/ojsheader.html.twig @@ -9,95 +9,106 @@ - Ojstr + Ojstrx - \ No newline at end of file + diff --git a/app/config/config.yml b/app/config/config.yml index 87a3d868a..db9b1998e 100755 --- a/app/config/config.yml +++ b/app/config/config.yml @@ -30,7 +30,7 @@ framework: doctrine_mongodb: connections: default: - server: mongodb://localhost:27017 + server: mongodb://127.0.0.1:27017 options: {} default_database: ojs document_managers: diff --git a/composer.lock b/composer.lock index 3c0ce3a23..4db8fd3d8 100644 --- a/composer.lock +++ b/composer.lock @@ -1,8 +1,7 @@ { "_readme": [ "This file locks the dependencies of your project to a known state", - "Read more about it at http://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file", - "This file is @generated automatically" + "Read more about it at http://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file" ], "hash": "9b25b80afd76b75bb7413f5c0037b0d3", "packages": [ @@ -103,16 +102,16 @@ }, { "name": "doctrine/annotations", - "version": "v1.1.2", + "version": "v1.2.0", "source": { "type": "git", "url": "https://github.com/doctrine/annotations.git", - "reference": "40db0c96985aab2822edbc4848b3bd2429e02670" + "reference": "d9b1a37e9351ddde1f19f09a02e3d6ee92e82efd" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/doctrine/annotations/zipball/40db0c96985aab2822edbc4848b3bd2429e02670", - "reference": "40db0c96985aab2822edbc4848b3bd2429e02670", + "url": "https://api.github.com/repos/doctrine/annotations/zipball/d9b1a37e9351ddde1f19f09a02e3d6ee92e82efd", + "reference": "d9b1a37e9351ddde1f19f09a02e3d6ee92e82efd", "shasum": "" }, "require": { @@ -120,12 +119,13 @@ "php": ">=5.3.2" }, "require-dev": { - "doctrine/cache": "1.*" + "doctrine/cache": "1.*", + "phpunit/phpunit": "4.*" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "1.0.x-dev" + "dev-master": "1.3.x-dev" } }, "autoload": { @@ -139,7 +139,7 @@ ], "authors": [ { - "name": "Jonathan H. Wage", + "name": "Jonathan Wage", "email": "jonwage@gmail.com", "homepage": "http://www.jwage.com/", "role": "Creator" @@ -160,7 +160,7 @@ { "name": "Johannes Schmitt", "email": "schmittjoh@gmail.com", - "homepage": "https://github.com/schmittjoh", + "homepage": "http://jmsyst.com", "role": "Developer of wrapped JMSSerializerBundle" } ], @@ -171,7 +171,7 @@ "docblock", "parser" ], - "time": "2013-06-16 21:33:03" + "time": "2014-07-06 15:52:21" }, { "name": "doctrine/cache", @@ -235,7 +235,7 @@ { "name": "Johannes Schmitt", "email": "schmittjoh@gmail.com", - "homepage": "https://github.com/schmittjoh", + "homepage": "http://jmsyst.com", "role": "Developer of wrapped JMSSerializerBundle" } ], @@ -882,7 +882,7 @@ "homepage": "http://avalanche123.com" }, { - "name": "Jonathan H. Wage", + "name": "Jonathan Wage", "email": "jonwage@gmail.com", "homepage": "http://www.jwage.com/", "role": "Creator" @@ -959,7 +959,7 @@ "homepage": "http://avalanche123.com" }, { - "name": "Jonathan H. Wage", + "name": "Jonathan Wage", "email": "jonwage@gmail.com", "homepage": "http://www.jwage.com/", "role": "Creator" @@ -1061,12 +1061,12 @@ "source": { "type": "git", "url": "https://github.com/FriendsOfSymfony/FOSRestBundle.git", - "reference": "d37f4410e6a97e81c720840b56e35c3a44942723" + "reference": "1ca8cbef698c295ba4e5e60c1c448aaab613d9fe" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/FriendsOfSymfony/FOSRestBundle/zipball/d37f4410e6a97e81c720840b56e35c3a44942723", - "reference": "d37f4410e6a97e81c720840b56e35c3a44942723", + "url": "https://api.github.com/repos/FriendsOfSymfony/FOSRestBundle/zipball/1ca8cbef698c295ba4e5e60c1c448aaab613d9fe", + "reference": "1ca8cbef698c295ba4e5e60c1c448aaab613d9fe", "shasum": "" }, "require": { @@ -1131,7 +1131,7 @@ "keywords": [ "rest" ], - "time": "2014-06-04 13:11:41" + "time": "2014-07-09 08:01:04" }, { "name": "gedmo/doctrine-extensions", @@ -1565,12 +1565,12 @@ "source": { "type": "git", "url": "https://github.com/schmittjoh/JMSSerializerBundle.git", - "reference": "ca66cd3ace6bea5367838c6dfb00a6a0bacb8a79" + "reference": "55bb8fc449c626ab8d47d58fa13fd37f84376dfc" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/schmittjoh/JMSSerializerBundle/zipball/ca66cd3ace6bea5367838c6dfb00a6a0bacb8a79", - "reference": "ca66cd3ace6bea5367838c6dfb00a6a0bacb8a79", + "url": "https://api.github.com/repos/schmittjoh/JMSSerializerBundle/zipball/55bb8fc449c626ab8d47d58fa13fd37f84376dfc", + "reference": "55bb8fc449c626ab8d47d58fa13fd37f84376dfc", "shasum": "" }, "require": { @@ -1626,7 +1626,7 @@ "serialization", "xml" ], - "time": "2014-02-09 12:04:09" + "time": "2014-07-08 16:41:25" }, { "name": "knplabs/knp-components", @@ -1945,12 +1945,12 @@ "source": { "type": "git", "url": "https://github.com/nelmio/NelmioApiDocBundle.git", - "reference": "54819590f29d8669c7ae1dae2acd1f070a1f0aac" + "reference": "b9b453c8578a9334080fbdc16bff92e7cb488561" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/nelmio/NelmioApiDocBundle/zipball/54819590f29d8669c7ae1dae2acd1f070a1f0aac", - "reference": "54819590f29d8669c7ae1dae2acd1f070a1f0aac", + "url": "https://api.github.com/repos/nelmio/NelmioApiDocBundle/zipball/b9b453c8578a9334080fbdc16bff92e7cb488561", + "reference": "b9b453c8578a9334080fbdc16bff92e7cb488561", "shasum": "" }, "require": { @@ -2011,7 +2011,7 @@ "documentation", "rest" ], - "time": "2014-07-02 12:37:52" + "time": "2014-07-09 08:29:17" }, { "name": "oneup/uploader-bundle", @@ -2378,12 +2378,12 @@ "source": { "type": "git", "url": "https://github.com/stof/StofDoctrineExtensionsBundle.git", - "reference": "3825a4a1a56805b6adcaf6df1f9ec892a653d377" + "reference": "085cda7ce5dc12b807a5a7856f178c93725a9166" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/stof/StofDoctrineExtensionsBundle/zipball/3825a4a1a56805b6adcaf6df1f9ec892a653d377", - "reference": "3825a4a1a56805b6adcaf6df1f9ec892a653d377", + "url": "https://api.github.com/repos/stof/StofDoctrineExtensionsBundle/zipball/085cda7ce5dc12b807a5a7856f178c93725a9166", + "reference": "085cda7ce5dc12b807a5a7856f178c93725a9166", "shasum": "" }, "require": { @@ -2431,7 +2431,7 @@ "translatable", "tree" ], - "time": "2014-05-24 12:33:49" + "time": "2014-07-08 17:06:10" }, { "name": "swiftmailer/swiftmailer", @@ -2835,25 +2835,25 @@ }, { "name": "twig/extensions", - "version": "v1.0.1", + "version": "v1.1.0", "source": { "type": "git", "url": "https://github.com/fabpot/Twig-extensions.git", - "reference": "f91a82ec225e5bb108e01a0f93c9be04f84dcfa0" + "reference": "c0ab818595338dd5569369bfce2552d02cec5d50" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/fabpot/Twig-extensions/zipball/f91a82ec225e5bb108e01a0f93c9be04f84dcfa0", - "reference": "f91a82ec225e5bb108e01a0f93c9be04f84dcfa0", + "url": "https://api.github.com/repos/fabpot/Twig-extensions/zipball/c0ab818595338dd5569369bfce2552d02cec5d50", + "reference": "c0ab818595338dd5569369bfce2552d02cec5d50", "shasum": "" }, "require": { - "twig/twig": "~1.0" + "twig/twig": "~1.12" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "1.0.x-dev" + "dev-master": "1.1.x-dev" } }, "autoload": { @@ -2876,24 +2876,23 @@ "description": "Common additional features for Twig that do not directly belong in core", "homepage": "https://github.com/fabpot/Twig-extensions", "keywords": [ - "debug", "i18n", "text" ], - "time": "2013-10-18 19:37:15" + "time": "2014-07-05 10:01:35" }, { "name": "twig/twig", - "version": "v1.15.1", + "version": "v1.16.0", "source": { "type": "git", "url": "https://github.com/fabpot/Twig.git", - "reference": "1fb5784662f438d7d96a541e305e28b812e2eeed" + "reference": "8ce37115802e257a984a82d38254884085060024" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/fabpot/Twig/zipball/1fb5784662f438d7d96a541e305e28b812e2eeed", - "reference": "1fb5784662f438d7d96a541e305e28b812e2eeed", + "url": "https://api.github.com/repos/fabpot/Twig/zipball/8ce37115802e257a984a82d38254884085060024", + "reference": "8ce37115802e257a984a82d38254884085060024", "shasum": "" }, "require": { @@ -2902,7 +2901,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "1.15-dev" + "dev-master": "1.16-dev" } }, "autoload": { @@ -2937,7 +2936,7 @@ "keywords": [ "templating" ], - "time": "2014-02-13 10:19:29" + "time": "2014-07-05 12:19:05" }, { "name": "willdurand/jsonp-callback-validator", @@ -2971,7 +2970,7 @@ ], "authors": [ { - "name": "William Durand", + "name": "William DURAND", "email": "william.durand1@gmail.com", "homepage": "http://www.willdurand.fr" } @@ -3106,9 +3105,7 @@ "time": "2014-07-01 13:50:50" } ], - "aliases": [ - - ], + "aliases": [], "minimum-stability": "stable", "stability-flags": { "friendsofsymfony/rest-bundle": 20, @@ -3124,7 +3121,5 @@ "platform": { "php": ">=5.3.3" }, - "platform-dev": [ - - ] + "platform-dev": [] } diff --git a/src/Ojstr/ManagerBundle/Resources/views/index.html.twig b/src/Ojstr/ManagerBundle/Resources/views/index.html.twig index 1e37979c4..25be6c794 100755 --- a/src/Ojstr/ManagerBundle/Resources/views/index.html.twig +++ b/src/Ojstr/ManagerBundle/Resources/views/index.html.twig @@ -2,11 +2,110 @@ {% block body %} - Login + Login +
+
+
+
+
+
+ +
+
+ +

Welcome to OJS™ ♥

+

+ Lorem ipsum dolor sit amet, his ea mollis fabellas principes. Quo mazim facilis tincidunt ut, utinam saperet facilisi an vim. +

+ +

+ start using OJS +

+
+
+

Create a OJS™ Profile

+

+ Lorem ipsum dolor sit amet, his ea mollis fabellas principes. Quo mazim facilis tincidunt ut, utinam saperet facilisi an vim. +

+ +

+ create your profile +

+ +
+
+

OJS™ goodies

+

+ Lorem ipsum dolor sit amet, his ea mollis fabellas principes. Quo mazim facilis tincidunt ut, utinam saperet facilisi an vim. +

+ +

+ start using OJS +

+
+
+

Drop comments!

+

+ Lorem ipsum dolor sit amet, his ea mollis fabellas principes. Quo mazim facilis tincidunt ut, utinam saperet facilisi an vim. +

+ +

+ start using OJS +

+
+
+
+ +
+

thanks for staying tuned! ♥ OJS

+

+ Lorem ipsum dolor sit amet, his ea mollis fabellas principes. Quo mazim facilis tincidunt ut, utinam saperet facilisi an vim. +

+
+
+
+ +
+
+
+
{% endblock %} {% block footer %} -
- © Okulbilişim okulbilisim.com +
+ © Okulbilişim okulbilisim.com {% endblock %} \ No newline at end of file diff --git a/web/assets/css/app.css b/web/assets/css/app.css index ad6d67cc5..84edcb8a8 100644 --- a/web/assets/css/app.css +++ b/web/assets/css/app.css @@ -27,3 +27,307 @@ ul.nav-wizard.nav-wizard-backnav li:hover,ul.nav-wizard.nav-wizard-backnav li:ho .modal_standart{width:600px;display:none;background:#FFF;border-radius:5px;-moz-border-radius:5px;-webkit-border-radius:5px;box-shadow:0 0 4px rgba(0,0,0,0.7);-webkit-box-shadow:0 0 4px rgba(0,0,0,0.7);-moz-box-shadow:0 0 4px rgba(0,0,0,0.7);padding:30px;} .modal_close{cursor:pointer;position:absolute;top:12px;right:12px;display:block;width:14px;height:14px;z-index:2;} .modal_close:after{content:"x";} + +#search { + position: fixed; + top: 0px; + left: 0px; + width: 100%; + height: 100%; + background-color: rgba(0, 0, 0, 0.7); + + -webkit-transition: all 0.5s ease-in-out; + -moz-transition: all 0.5s ease-in-out; + -o-transition: all 0.5s ease-in-out; + -ms-transition: all 0.5s ease-in-out; + transition: all 0.5s ease-in-out; + + -webkit-transform: translate(0px, -100%) scale(0, 0); + -moz-transform: translate(0px, -100%) scale(0, 0); + -o-transform: translate(0px, -100%) scale(0, 0); + -ms-transform: translate(0px, -100%) scale(0, 0); + transform: translate(0px, -100%) scale(0, 0); + + opacity: 0; + z-index: 9999; +} + +#search.open { + -webkit-transform: translate(0px, 0px) scale(1, 1); + -moz-transform: translate(0px, 0px) scale(1, 1); + -o-transform: translate(0px, 0px) scale(1, 1); + -ms-transform: translate(0px, 0px) scale(1, 1); + transform: translate(0px, 0px) scale(1, 1); + opacity: 1; +} + +#search input[type="search"] { + position: absolute; + top: 50%; + width: 100%; + color: rgb(255, 255, 255); + background: rgba(0, 0, 0, 0); + font-size: 60px; + font-weight: 300; + text-align: center; + border: 0px; + margin: 0px auto; + margin-top: -51px; + padding-left: 30px; + padding-right: 30px; + outline: none; +} +#search .btn { + position: absolute; + top: 50%; + left: 50%; + margin-top: 61px; + margin-left: -45px; +} +#search .close { + position: fixed; + top: 15px; + right: 15px; + color: #fff; + background-color: #428bca; + border-color: #357ebd; + opacity: 1; + padding: 10px 17px; + font-size: 27px; +} + + +.homebrand .board{ + width: 75%; + margin: 60px auto; + height: 500px; + background: #fff; + /*box-shadow: 10px 10px #ccc,-10px 20px #ddd;*/ +} +.homebrand .board .nav-tabs { + position: relative; + /* border-bottom: 0; */ + /* width: 80%; */ + margin: 40px auto; + margin-bottom: 0; + box-sizing: border-box; + +} + +.homebrand .board > div.board-inner{ + background: #fafafa url(http://subtlepatterns.com/patterns/geometry2.png); + background-size: 30%; +} + +.homebrand p.narrow{ + width: 60%; + margin: 10px auto; +} + +.homebrand .liner{ + height: 2px; + background: #ddd; + position: absolute; + width: 80%; + margin: 0 auto; + left: 0; + right: 0; + top: 50%; + z-index: 1; +} + +.homebrand .nav-tabs > li.active > a,.homebrand .nav-tabs > li.active > a:hover,.homebrand .nav-tabs > li.active > a:focus { + color: #555555; + cursor: default; + background-color:transparent !important; + border: none !important; + border-bottom-color: transparent!important; +} +.homebrand .nav>li>a{ + padding:0px !important; +} +.homebrand .nav-tabs>li>a{ + margin-right: 0px !important; + margin-left: 55px !important; +} +.homebrand span.round-tabs{ + width: 70px; + height: 70px; + line-height: 70px; + display: inline-block; + border-radius: 100px; + background: white; + z-index: 2; + position: absolute; + left: 0; + text-align: center; + font-size: 25px; +} + +.homebrand span.round-tabs.one{ + color: rgb(34, 194, 34);border: 2px solid rgb(34, 194, 34); +} + +.homebrand li.active span.round-tabs.one{ + background: #fff !important; + border: 2px solid #ddd; + color: rgb(34, 194, 34); +} + +.homebrand span.round-tabs.two{ + color: #febe29;border: 2px solid #febe29; +} + +.homebrand li.active span.round-tabs.two{ + background: #fff !important; + border: 2px solid #ddd; + color: #febe29; +} + +.homebrand span.round-tabs.three{ + color: #3e5e9a;border: 2px solid #3e5e9a; +} + +.homebrand li.active span.round-tabs.three{ + background: #fff !important; + border: 2px solid #ddd; + color: #3e5e9a; +} + +.homebrand span.round-tabs.four{ + color: #f1685e;border: 2px solid #f1685e; +} + +.homebrand li.active span.round-tabs.four{ + background: #fff !important; + border: 2px solid #ddd; + color: #f1685e; +} + +.homebrand span.round-tabs.five{ + color: #999;border: 2px solid #999; +} + +.homebrand li.active span.round-tabs.five{ + background: #fff !important; + border: 2px solid #ddd; + color: #999; +} + +.homebrand .nav-tabs > li.active > a span.round-tabs{ + background: #fafafa; +} +.homebrand .nav>li>a:hover, .homebrand .nav>li>a:focus{ + border-color:transparent !important; + background-color:transparent !important; +} +.homebrand .nav-tabs>li>a:hover{ + border-color:transparent !important; +} +.homebrand .nav-tabs > li { + width: 20%; +} +/*li.active:before { + content: " "; + position: absolute; + left: 45%; + opacity:0; + margin: 0 auto; + bottom: -2px; + border: 10px solid transparent; + border-bottom-color: #fff; + z-index: 1; + transition:0.2s ease-in-out; +}*/ +.homebrand li:after { + content: " "; + position: absolute; + left: 45%; + opacity:0; + margin: 0 auto; + bottom: 0px; + border: 5px solid transparent; + border-bottom-color: #ddd; + transition:0.1s ease-in-out; + +} +.homebrand li.active:after { + content: " "; + position: absolute; + left: 45%; + opacity:1; + margin: 0 auto; + bottom: 0px; + border: 10px solid transparent; + border-bottom-color: #ddd; + +} +.homebrand .nav-tabs > li a{ + width: 70px; + height: 70px; + margin: 20px auto; + border-radius: 100%; + padding: 0; +} + +.homebrand .nav-tabs > li a:hover{ + background: transparent; +} + +.homebrand .tab-content{ +} +.homebrand .tab-pane{ + position: relative; + padding-top: 50px; +} +.homebrand .tab-content .head{ + font-family: 'Roboto Condensed', sans-serif; + font-size: 25px; + text-transform: uppercase; + padding-bottom: 10px; +} +.homebrand .btn-outline-rounded{ + padding: 10px 40px; + margin: 20px 0; + border: 2px solid transparent; + border-radius: 25px; +} + +.homebrand .btn.green{ + background-color:#5cb85c; + /*border: 2px solid #5cb85c;*/ + color: #ffffff; +} + + +@media( max-width : 585px ){ + + .homebrand .board { + width: 90%; + height:auto !important; + } + .homebrand span.round-tabs { + font-size:16px; + width: 50px; + height: 50px; + line-height: 50px; + } + .homebrand .tab-content .head{ + font-size:20px; + } + .homebrand .nav-tabs > li a { + width: 50px; + height: 50px; + line-height:50px; + } + + .homebrand li.active:after { + content: " "; + position: absolute; + left: 35%; + } + + .homebrand .btn-outline-rounded { + padding:12px 20px; + } +} diff --git a/web/assets/js/common.js b/web/assets/js/common.js index a0e1b6e5a..f965e5210 100644 --- a/web/assets/js/common.js +++ b/web/assets/js/common.js @@ -19,6 +19,7 @@ $.fn.serializeObject = function() $(document).ready(function() { $("a[rel*=modal]").leanModal({closeButton: ".modal_close"}); $(".sidebar .treeview").tree(); + $('a[title]').tooltip(); $("[data-toggle='offcanvas']").click(function(e) { e.preventDefault(); @@ -35,6 +36,18 @@ $(document).ready(function() { $(".right-side").toggleClass("strech"); } }); + + $('a[href="#search"]').on('click', function(event) { + event.preventDefault(); + $('#search').addClass('open'); + $('#search > form > input[type="search"]').focus(); + }); + + $('#search, #search button.close').on('click keyup', function(event) { + if (event.target == this || event.target.className == 'close' || event.keyCode == 27) { + $(this).removeClass('open'); + } + }); });