.

synergia · May 4, 2016 · 59acc4f · 59acc4f
1 parent ec1446f
commit 59acc4f
Show file tree

Hide file tree

Showing 194 changed files with 16 additions and 13 deletions.
diff --git a/.gitignore b/.gitignore
diff --git a/404.php b/404.php
diff --git a/CHANGELOG.md b/CHANGELOG.md
diff --git a/README.md b/README.md
diff --git a/author.php b/author.php
diff --git a/bower.json b/bower.json
diff --git a/build/font/fontello.eot b/build/font/fontello.eot
diff --git a/build/font/fontello.svg b/build/font/fontello.svg
diff --git a/build/font/fontello.ttf b/build/font/fontello.ttf
diff --git a/build/font/fontello.woff b/build/font/fontello.woff
diff --git a/build/font/fontello.woff2 b/build/font/fontello.woff2
diff --git a/build/img/apple-touch-icon-precomposed.png b/build/img/apple-touch-icon-precomposed.png
diff --git a/build/img/b.jpg b/build/img/b.jpg
diff --git a/build/img/card.png b/build/img/card.png
diff --git a/build/img/chip.png b/build/img/chip.png
diff --git a/build/img/circle.svg b/build/img/circle.svg
diff --git a/build/img/favicon.ico b/build/img/favicon.ico
diff --git a/build/img/favicon.png b/build/img/favicon.png
diff --git a/build/img/full.png b/build/img/full.png
diff --git a/build/img/grzeg.jpg b/build/img/grzeg.jpg
diff --git a/build/img/login_bg.jpg b/build/img/login_bg.jpg
diff --git a/build/img/logo.png b/build/img/logo.png
diff --git a/build/img/logo.svg b/build/img/logo.svg
diff --git a/build/img/[email protected] b/build/img/[email protected]
diff --git a/build/img/main-og-img.png b/build/img/main-og-img.png
diff --git a/build/img/member.png b/build/img/member.png
diff --git a/build/img/pwr.svg b/build/img/pwr.svg
diff --git a/build/img/safari_120.png b/build/img/safari_120.png
diff --git a/build/img/safari_152.png b/build/img/safari_152.png
diff --git a/build/img/safari_60.png b/build/img/safari_60.png
diff --git a/build/img/safari_76.png b/build/img/safari_76.png
diff --git a/build/img/synergia-mono-horizontal-inverted.svg b/build/img/synergia-mono-horizontal-inverted.svg
diff --git a/build/img/thumb.png b/build/img/thumb.png
diff --git a/build/js/404.min.js b/build/js/404.min.js
diff --git a/build/js/blazy.min.js b/build/js/blazy.min.js
diff --git a/build/js/main.min.js b/build/js/main.min.js
diff --git a/build/js/map.min.js b/build/js/map.min.js
diff --git a/build/js/member.min.js b/build/js/member.min.js
diff --git a/build/js/prism.min.js b/build/js/prism.min.js
diff --git a/build/js/swipe.min.js b/build/js/swipe.min.js
diff --git a/build/style/admin.css b/build/style/admin.css
diff --git a/build/style/main.css b/build/style/main.css
diff --git a/build/style/prism-okaidia.css b/build/style/prism-okaidia.css
diff --git a/comments.php b/comments.php
diff --git a/footer.php b/footer.php
diff --git a/functions.php b/functions.php
diff --git a/gulpfile.js b/gulpfile.js
diff --git a/header.php b/header.php
diff --git a/index.php b/index.php
diff --git a/lib/general/dashboard.php b/lib/general/dashboard.php
diff --git a/lib/general/lazy.php b/lib/general/lazy.php
diff --git a/lib/general/meta-tags.php b/lib/general/meta-tags.php
diff --git a/lib/general/removes.php b/lib/general/removes.php
diff --git a/lib/general/setup.php b/lib/general/setup.php
diff --git a/lib/general/slider.php b/lib/general/slider.php
diff --git a/lib/general/utils.php b/lib/general/utils.php
diff --git a/lib/general/walker.php b/lib/general/walker.php
diff --git a/lib/login/login.php b/lib/login/login.php
diff --git a/lib/members/ajax.php b/lib/members/ajax.php
diff --git a/lib/members/capabilities.php b/lib/members/capabilities.php
diff --git a/lib/members/profile.php b/lib/members/profile.php
diff --git a/lib/members/utils.php b/lib/members/utils.php
diff --git a/lib/options/callbacks.php b/lib/options/callbacks.php
diff --git a/lib/options/display.php b/lib/options/display.php
diff --git a/lib/options/options.php b/lib/options/options.php
diff --git a/lib/posts/ajax.php b/lib/posts/ajax.php
diff --git a/lib/posts/post.php b/lib/posts/post.php
diff --git a/lib/posts/utils.php b/lib/posts/utils.php
@@ -50,7 +50,7 @@ function My_TagCloud($params = array()) {
     		else {
     			$class = $sizeclass;
     		}
-            $ret .= ($wrapper ? '<'.$wrapper.' class="tagWrapper">' : '') . '<a href="'.$url.'" class="'.$class.' link">#'.$tag->name.'</a>' .
+            $ret .= ($wrapper ? '<'.$wrapper.' class="tagWrapper">' : '') . '<a href="'.$url.'" class="'.$class.' link">'.$tag->name.'</a>' .
 			($wrapper ? '</'.$wrapper.'>' : '');
 
     	}

diff --git a/lib/projects/attachments.php b/lib/projects/attachments.php
diff --git a/lib/projects/links.php b/lib/projects/links.php
diff --git a/lib/projects/post-type.php b/lib/projects/post-type.php
diff --git a/lib/projects/project.php b/lib/projects/project.php
diff --git a/lib/projects/utils.php b/lib/projects/utils.php
diff --git a/lib/sponsors/post-type.php b/lib/sponsors/post-type.php
diff --git a/lib/sponsors/utils.php b/lib/sponsors/utils.php
diff --git a/lib/ultron/ultron.php b/lib/ultron/ultron.php
@@ -4,10 +4,12 @@
 function ultron_get_state()
 {
     $ultron_data = ultron_get_data();
-    if ($ultron_data[0] == True) {
-        return array('Zamknięte', $ultron_data[1]);
+    echo $ultron_data[1];
+    echo $ultron_data[0];
+    if ($ultron_data[1] == "True") {
+        return array('Zamknięte', $ultron_data[0]);
     } else {
-        return array('Otwarte', $ultron_data[1]);
+        return array('Otwarte', $ultron_data[0]);
     }
 }
 
@@ -16,8 +18,8 @@ function ultron_get_data()
     $fh = fopen('../ultron/ultron.data', 'r');
     $ultron_data = array();
 
-    while ($line = fgets($fh)) {
-        array_push($ultron_data, $line);
+    while (feof($fh) !== true) {
+        $ultron_data[] = fgets($fh);
     }
     fclose($fh);
 

diff --git a/package.json b/package.json
diff --git a/page-templates/about.php b/page-templates/about.php
diff --git a/page-templates/blog.php b/page-templates/blog.php
diff --git a/page-templates/lab.php b/page-templates/lab.php
@@ -14,7 +14,7 @@
             <?php echo $ultron_state[0]; ?>
         </div>
         <div class="ultron__datetime">
-            <?php echo date_i18n('H:i:s d.m.Y',$ultron_state[1]); ?>
+            <?php echo $ultron_state[1]; ?>
         </div>
     </div>
 </div>

diff --git a/page-templates/login.php b/page-templates/login.php
diff --git a/page-templates/main.php b/page-templates/main.php
diff --git a/page-templates/members.php b/page-templates/members.php
diff --git a/page-templates/projects.php b/page-templates/projects.php
diff --git a/page.php b/page.php
diff --git a/parts/archive.php b/parts/archive.php
diff --git a/parts/banner.php b/parts/banner.php
diff --git a/parts/member.php b/parts/member.php
diff --git a/parts/membercard-small.php b/parts/membercard-small.php
diff --git a/parts/membercard.php b/parts/membercard.php
diff --git a/parts/pwr.php b/parts/pwr.php
diff --git a/parts/sponsors.php b/parts/sponsors.php
@@ -18,19 +18,20 @@
 function show_links($items) {
   if ($items->have_posts()) {
       while ($items->have_posts()) {
-          $items->the_post();?>
+          $items->the_post();
+          $url = carbon_get_post_meta(get_the_ID(), 'crb_sponsor_link'); ?>
           <div class="brand"
                data-brand-name="<?php the_title(); ?>"
-               data-brand-link="<?php echo carbon_get_post_meta(get_the_ID(), 'crb_sponsor_link'); ?>"
+               data-brand-link="<?php echo $url; ?>"
                data-brand-desc="<?php echo wp_filter_nohtml_kses(get_the_content()); ?>">
               <div class="brand__controls">
                   <div class="brand__more">
-                      <a title="Dowiedz się więcej" href='' class="link link--controls" target="_blank">
+                      <a title="Dowiedz się więcej" href="" class="link link--controls" target="_blank">
                           <i class="icon-dot-3"></i>
                       </a>
                   </div>
                   <div class="brand__link">
-                      <a title="Odwiedź stronę" href='' class="link link--controls" target="_blank">
+                      <a title="Odwiedź stronę" href="<?php echo $url; ?>" class="link link--controls" target="_blank">
                           <i class="icon-link"></i>
                       </a>
                   </div>

diff --git a/parts/topbar.php b/parts/topbar.php
diff --git a/screenshot.png b/screenshot.png
diff --git a/scripts/mail.php b/scripts/mail.php
diff --git a/single-project.php b/single-project.php
diff --git a/single.php b/single.php
diff --git a/src/font/fontello.eot b/src/font/fontello.eot
diff --git a/src/font/fontello.svg b/src/font/fontello.svg
diff --git a/src/font/fontello.ttf b/src/font/fontello.ttf
diff --git a/src/font/fontello.woff b/src/font/fontello.woff
diff --git a/src/font/fontello.woff2 b/src/font/fontello.woff2
diff --git a/src/img/apple-touch-icon-precomposed.png b/src/img/apple-touch-icon-precomposed.png
diff --git a/src/img/b.jpg b/src/img/b.jpg
diff --git a/src/img/card.png b/src/img/card.png
diff --git a/src/img/chip.png b/src/img/chip.png
diff --git a/src/img/circle.svg b/src/img/circle.svg
diff --git a/src/img/favicon.ico b/src/img/favicon.ico
diff --git a/src/img/favicon.png b/src/img/favicon.png
diff --git a/src/img/full.png b/src/img/full.png
diff --git a/src/img/grzeg.jpg b/src/img/grzeg.jpg
diff --git a/src/img/login_bg.jpg b/src/img/login_bg.jpg
diff --git a/src/img/logo.png b/src/img/logo.png
diff --git a/src/img/logo.svg b/src/img/logo.svg
diff --git a/src/img/[email protected] b/src/img/[email protected]
diff --git a/src/img/main-og-img.png b/src/img/main-og-img.png
diff --git a/src/img/member.png b/src/img/member.png
diff --git a/src/img/pwr.svg b/src/img/pwr.svg
diff --git a/src/img/safari_120.png b/src/img/safari_120.png
diff --git a/src/img/safari_152.png b/src/img/safari_152.png
diff --git a/src/img/safari_60.png b/src/img/safari_60.png
diff --git a/src/img/safari_76.png b/src/img/safari_76.png
diff --git a/src/img/synergia-mono-horizontal-inverted.svg b/src/img/synergia-mono-horizontal-inverted.svg
diff --git a/src/img/thumb.png b/src/img/thumb.png
diff --git a/src/js/404.js b/src/js/404.js
diff --git a/src/js/main.js b/src/js/main.js
diff --git a/src/js/map.js b/src/js/map.js
diff --git a/src/js/member.js b/src/js/member.js
diff --git a/src/js/partials/banner.js b/src/js/partials/banner.js
diff --git a/src/js/partials/counter.js b/src/js/partials/counter.js
diff --git a/src/js/partials/dropdown.js b/src/js/partials/dropdown.js
diff --git a/src/js/partials/excerpt.js b/src/js/partials/excerpt.js
@@ -1,6 +1,6 @@
    function cardExcerpt() {
     $(".card__excerpt").text(function(index, currentText) {
-      return currentText.substr(0, 140) + '\u2026';
+      return currentText.substr(0, 125) + '\u2026';
     });
   }
   cardExcerpt();
diff --git a/src/js/partials/footer.js b/src/js/partials/footer.js
diff --git a/src/js/partials/github.js b/src/js/partials/github.js
diff --git a/src/js/partials/image-wrapper.js b/src/js/partials/image-wrapper.js
diff --git a/src/js/partials/lastfm.js b/src/js/partials/lastfm.js
diff --git a/src/js/partials/lazy.js b/src/js/partials/lazy.js
diff --git a/src/js/partials/load-more.js b/src/js/partials/load-more.js
diff --git a/src/js/partials/modal.js b/src/js/partials/modal.js
diff --git a/src/js/partials/name-trimmer.js b/src/js/partials/name-trimmer.js
diff --git a/src/js/partials/nav.js b/src/js/partials/nav.js
diff --git a/src/js/partials/notifications.js b/src/js/partials/notifications.js
diff --git a/src/js/partials/odmiana.js b/src/js/partials/odmiana.js
diff --git a/src/js/partials/recruitment.js b/src/js/partials/recruitment.js
diff --git a/src/js/partials/show-nicknames.js b/src/js/partials/show-nicknames.js
diff --git a/src/js/partials/slide-in.js b/src/js/partials/slide-in.js
diff --git a/src/js/partials/slider.js b/src/js/partials/slider.js
diff --git a/src/js/partials/smooth-scroll.js b/src/js/partials/smooth-scroll.js
diff --git a/src/js/partials/tabs.js b/src/js/partials/tabs.js
diff --git a/src/js/partials/tooltip.js b/src/js/partials/tooltip.js
diff --git a/src/js/partials/topbar.js b/src/js/partials/topbar.js
diff --git a/src/style/_404.scss b/src/style/_404.scss
diff --git a/src/style/_about.scss b/src/style/_about.scss
diff --git a/src/style/_animations.scss b/src/style/_animations.scss
diff --git a/src/style/_archive.scss b/src/style/_archive.scss
diff --git a/src/style/_author.scss b/src/style/_author.scss
diff --git a/src/style/_banner.scss b/src/style/_banner.scss
diff --git a/src/style/_blazy.scss b/src/style/_blazy.scss
diff --git a/src/style/_components.scss b/src/style/_components.scss
diff --git a/src/style/_footer.scss b/src/style/_footer.scss
diff --git a/src/style/_helpers.scss b/src/style/_helpers.scss
diff --git a/src/style/_login.scss b/src/style/_login.scss
diff --git a/src/style/_mixins.scss b/src/style/_mixins.scss
diff --git a/src/style/_nojs.scss b/src/style/_nojs.scss
diff --git a/src/style/_print.scss b/src/style/_print.scss
diff --git a/src/style/_project.scss b/src/style/_project.scss
diff --git a/src/style/_recruitment.scss b/src/style/_recruitment.scss
diff --git a/src/style/_sponsors-n-partners.scss b/src/style/_sponsors-n-partners.scss
diff --git a/src/style/_topbar.scss b/src/style/_topbar.scss
diff --git a/src/style/_ultron.scss b/src/style/_ultron.scss
diff --git a/src/style/_vars.scss b/src/style/_vars.scss
diff --git a/src/style/admin.scss b/src/style/admin.scss
diff --git a/src/style/components/_blogcard.scss b/src/style/components/_blogcard.scss
diff --git a/src/style/components/_burger.scss b/src/style/components/_burger.scss
diff --git a/src/style/components/_button.scss b/src/style/components/_button.scss
diff --git a/src/style/components/_card.scss b/src/style/components/_card.scss
diff --git a/src/style/components/_dropdown.scss b/src/style/components/_dropdown.scss
diff --git a/src/style/components/_github.scss b/src/style/components/_github.scss
diff --git a/src/style/components/_icons.scss b/src/style/components/_icons.scss
diff --git a/src/style/components/_lastfm.scss b/src/style/components/_lastfm.scss
diff --git a/src/style/components/_link.scss b/src/style/components/_link.scss
diff --git a/src/style/components/_loading.scss b/src/style/components/_loading.scss
diff --git a/src/style/components/_map.scss b/src/style/components/_map.scss
diff --git a/src/style/components/_membercard-small.scss b/src/style/components/_membercard-small.scss
diff --git a/src/style/components/_membercard.scss b/src/style/components/_membercard.scss
diff --git a/src/style/components/_modal.scss b/src/style/components/_modal.scss
diff --git a/src/style/components/_notifications.scss b/src/style/components/_notifications.scss
diff --git a/src/style/components/_slider.scss b/src/style/components/_slider.scss
diff --git a/src/style/components/_tabs.scss b/src/style/components/_tabs.scss
diff --git a/src/style/components/_tagscloud.scss b/src/style/components/_tagscloud.scss
diff --git a/src/style/components/_tooltips.scss b/src/style/components/_tooltips.scss
diff --git a/src/style/main.scss b/src/style/main.scss
diff --git a/style.css b/style.css
diff --git a/template-part-member.php b/template-part-member.php