From 7e27039b24a02e237c4c27eef2703e3feb1c8cea Mon Sep 17 00:00:00 2001
From: Sergio Oliveira <sergio@tracy.com.br>
Date: Fri, 31 Oct 2014 14:38:16 -0200
Subject: [PATCH] Added Portal do Software Publico modifications

---
 colab/static/img/fav.ico  | Bin 3262 -> 0 bytes
 colab/static/img/logo.svg | 72 ++++++++----------------------------------------------------------------
 colab/templates/base.html |  5 ++---
 3 files changed, 10 insertions(+), 67 deletions(-)

diff --git a/colab/static/img/fav.ico b/colab/static/img/fav.ico
index 4290246..d4f9b19 100644
Binary files a/colab/static/img/fav.ico and b/colab/static/img/fav.ico differ
diff --git a/colab/static/img/logo.svg b/colab/static/img/logo.svg
index cd22010..4fa731d 100644
--- a/colab/static/img/logo.svg
+++ b/colab/static/img/logo.svg
@@ -1,64 +1,8 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   version="1.1"
-   width="645.0506"
-   height="192.82056"
-   id="svg2">
-  <defs
-     id="defs4" />
-  <metadata
-     id="metadata7">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     transform="translate(-58.02724,-191.19295)"
-     id="layer1">
-    <path
-       d="m 63.02724,197.18097 0,154.59066 17.780425,0 1.96673,-0.52717 0,-78.99093 8.405162,0 0,78.03622 22.225453,0 0,-78.03622 5.92681,0 2.96343,0 0,78.53009 18.76816,0 0,-78.53009 6.23758,1.67135 0,76.85874 20.43302,0 0,-127.92007 32.10348,0 0,-26.6706 z"
-       id="path3078"
-       style="fill:#b9ce2a;fill-opacity:1;stroke:none" />
-    <path
-       d="m 274.98763,378.02549 0,-154.59066 -17.78042,0 -1.96673,0.52717 0,78.99093 -8.40516,0 0,-78.03622 -22.22546,0 0,78.03622 -5.92681,0 -2.96343,0 0,-78.53009 -18.76815,0 0,78.53009 -6.23758,-1.67135 0,-76.85874 -20.43302,0 0,127.92007 -32.10349,0 0,26.6706 z"
-       id="path3108"
-       style="fill:#aabac3;fill-opacity:1;stroke:none" />
-    <g
-       id="text3878"
-       style="font-size:141.21679688px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#595b5d;fill-opacity:0.90980392;stroke:none;font-family:Sans">
-      <path
-         d="m 367.92842,326.69158 c -0.94152,15.72214 -8.75551,23.5832 -23.44199,23.5832 l -23.5832,0 c -6.40186,0 -11.95638,-2.30654 -16.66358,-6.91962 -4.6131,-4.61307 -6.91964,-10.1676 -6.91963,-16.66358 l 0,-58.74619 c -10e-6,-6.40174 2.25946,-11.90919 6.77841,-16.52237 4.61306,-4.70712 10.21465,-7.06073 16.8048,-7.06084 l 23.5832,0 c 14.78062,1.1e-4 22.59461,7.86117 23.44199,23.58321 l -11.72099,0 c -0.94152,-7.90805 -4.84851,-11.86212 -11.721,-11.86221 l -11.86221,0 c -3.20095,9e-5 -5.97822,1.1769 -8.33179,3.53042 -2.2595,2.25955 -3.38924,5.03681 -3.3892,8.33179 l 0,58.74619 c -4e-5,3.20093 1.1297,5.97819 3.3892,8.33179 2.35357,2.35362 5.13084,3.53043 8.33179,3.53042 l 11.86221,0 c 6.96663,1e-5 10.87363,-3.95406 11.721,-11.86221 l 11.72099,0"
-         id="path3015"
-         style="font-variant:normal;font-stretch:normal;fill:#595b5d;font-family:Silom;-inkscape-font-specification:Silom" />
-      <path
-         d="m 415.23164,267.94539 23.5832,0 c 6.40176,8e-5 11.90921,2.30662 16.52237,6.91962 4.613,4.61315 6.91954,10.1206 6.91962,16.52237 l 0,35.3042 c -8e-5,6.40184 -2.30662,11.95636 -6.91962,16.66358 -4.61316,4.61308 -10.12061,6.91962 -16.52237,6.91962 l -23.5832,0 c -6.40186,0 -11.95638,-2.30654 -16.66359,-6.91962 -4.61309,-4.61307 -6.91963,-10.1676 -6.91962,-16.66358 l 0,-35.3042 c -1e-5,-6.40177 2.30653,-11.90922 6.91962,-16.52237 4.70721,-4.613 10.26173,-6.91954 16.66359,-6.91962 m 0,23.44199 0,35.3042 c -4e-5,3.20093 1.12969,5.97819 3.3892,8.33179 2.35357,2.35362 5.13083,3.53043 8.33179,3.53042 3.29501,1e-5 6.07227,-1.1768 8.33179,-3.53042 2.35356,-2.3536 3.53036,-5.13086 3.53042,-8.33179 l 0,-35.3042 c -6e-5,-3.20086 -1.17686,-5.93104 -3.53042,-8.19058 -2.25952,-2.35354 -5.03678,-3.53035 -8.33179,-3.53042 -3.20096,7e-5 -5.97822,1.17688 -8.33179,3.53042 -2.25951,2.25954 -3.38924,4.98972 -3.3892,8.19058"
-         id="path3017"
-         style="font-variant:normal;font-stretch:normal;fill:#595b5d;font-family:Silom;-inkscape-font-specification:Silom" />
-      <path
-         d="m 485.97684,350.27478 0,-105.9126 23.5832,0 0,105.9126 -23.5832,0"
-         id="path3019"
-         style="font-variant:normal;font-stretch:normal;fill:#595b5d;font-family:Silom;-inkscape-font-specification:Silom" />
-      <path
-         d="m 580.30745,303.24959 0,-11.86221 c -6e-5,-3.20086 -1.17687,-5.93104 -3.53042,-8.19058 -2.25952,-2.35354 -5.03678,-3.53035 -8.33179,-3.53042 l -11.721,0 c -6.96672,7e-5 -10.87371,3.90707 -11.72099,11.721 l -11.86221,0 c 1.88288,-15.62792 9.74394,-23.44191 23.5832,-23.44199 l 23.58321,0 c 6.40176,8e-5 11.90921,2.30662 16.52236,6.91962 4.61301,4.61315 6.91954,10.1206 6.91963,16.52237 l 0,58.8874 -23.44199,0 0,-11.72099 c -0.94151,7.814 -4.89557,11.72099 -11.86221,11.72099 l -11.721,0 c -6.40185,0 -11.95638,-2.30654 -16.66358,-6.91962 -4.61309,-4.61307 -6.91963,-10.1676 -6.91962,-16.66358 l 0,0 c -10e-6,-6.4018 2.30653,-11.90925 6.91962,-16.52237 4.7072,-4.61304 10.26173,-6.91958 16.66358,-6.91962 l 23.58321,0 m 0,11.72099 -11.86221,0 c -3.20096,4e-5 -5.97822,1.17684 -8.33179,3.53042 -2.25951,2.2595 -3.38924,4.98969 -3.38921,8.19058 l 0,0 c -3e-5,3.20093 1.1297,5.97819 3.38921,8.33179 2.35357,2.35362 5.13083,3.53043 8.33179,3.53042 3.29501,1e-5 6.07227,-1.1768 8.33179,-3.53042 2.35355,-2.3536 3.53036,-5.13086 3.53042,-8.33179 l 0,-11.721"
-         id="path3021"
-         style="font-variant:normal;font-stretch:normal;fill:#595b5d;font-family:Silom;-inkscape-font-specification:Silom" />
-      <path
-         d="m 627.46944,350.27478 0,-105.9126 23.5832,0 0,35.3042 c 0.47069,-3.95399 1.69457,-6.87247 3.67164,-8.75544 1.97699,-1.97695 4.66011,-2.96547 8.04936,-2.96555 l 11.86221,0 c 6.40176,8e-5 11.90921,2.30662 16.52236,6.91962 4.61301,4.61315 6.91954,10.1206 6.91963,16.52237 l 0,35.3042 c -9e-5,6.40184 -2.30662,11.95636 -6.91963,16.66358 -4.61315,4.61308 -10.1206,6.91962 -16.52236,6.91962 l -47.16641,0 m 23.5832,-11.72099 11.721,0 c 3.29501,1e-5 6.07227,-1.1768 8.33179,-3.53042 2.35355,-2.3536 3.53036,-5.13086 3.53042,-8.33179 l 0,-35.3042 c -6e-5,-3.20086 -1.17687,-5.93104 -3.53042,-8.19058 -2.25952,-2.35354 -5.03678,-3.53035 -8.33179,-3.53042 -3.20096,7e-5 -5.97822,1.17688 -8.33179,3.53042 -2.25951,2.25954 -3.38924,4.98972 -3.38921,8.19058 l 0,47.16641"
-         id="path3023"
-         style="font-variant:normal;font-stretch:normal;fill:#595b5d;font-family:Silom;-inkscape-font-specification:Silom" />
-    </g>
-  </g>
-</svg>
+<svg xmlns="http://www.w3.org/2000/svg" version="1.1" x="0" y="0" width="752.21" height="105" viewBox="0 0 752.21 105" xml:space="preserve"><style type="text/css">
+	.st0{fill:none;stroke:#333333;stroke-width:2.0352;stroke-miterlimit:10;}
+	.st1{fill:#FF0066;stroke:#333333;stroke-width:2.0352;stroke-miterlimit:10;}
+	.st2{fill:#333333;stroke:#333333;stroke-width:2.0352;stroke-miterlimit:10;}
+	.st3{fill:#000000;}
+	.st4{fill:#CCFF00;stroke:#333333;stroke-width:2.0352;stroke-miterlimit:10;}
+	.st5{fill:none;stroke:#333333;stroke-width:2.0352;stroke-miterlimit:10;}
+</style><line class="st5" x1="683.02" y1="21.68" x2="718.04" y2="21.64"/><line class="st0" x1="682.81" y1="21.83" x2="631.08" y2="13.32"/><line class="st0" x1="590.59" y1="30.33" x2="631.08" y2="13.32"/><path class="st1" d="M690.58 21.83c0 4.3-3.53 7.77-7.77 7.77 -4.23 0-7.77-3.47-7.77-7.77s3.54-7.77 7.77-7.77C687.05 14.06 690.58 17.53 690.58 21.83z"/><path class="st4" d="M642.86 13.32c0 6.52-5.37 11.79-11.78 11.79 -6.41 0-11.79-5.26-11.79-11.79 0-6.52 5.37-11.78 11.79-11.78C637.49 1.54 642.86 6.8 642.86 13.32z"/><path class="st3" d="M26.6 76.14c0-3.99-1.32-5.48-9.86-7.67C8.61 66.36 3.13 63.69 3.13 56.5c0-6.97 6.34-11.42 15.96-11.42 5.95 0 10.72 1.79 14.32 4.38l-3.21 4.85c-3.05-2.19-6.49-3.52-10.95-3.52 -6.42 0-8.7 1.96-8.7 5.24 0 3.44 2.5 4.7 10.57 6.97 7.91 2.19 13.22 4.62 13.22 12.59 0 9-8.61 12.6-17.61 12.6 -7.59 0-13.14-2.5-16.74-5.63l4-4.54c3.21 2.66 7.89 4.38 12.75 4.38C22.86 82.4 26.6 79.97 26.6 76.14z"/><path class="st3" d="M64.79 45.08c11.74 0 17.93 8.45 17.93 21.52 0 12.75-6.35 21.6-18 21.6 -11.75 0-18.01-8.45-18.01-21.52C46.71 53.91 53.06 45.08 64.79 45.08zM64.79 50.86c-6.88 0-10.41 5-10.41 15.81 0 10.72 3.44 15.73 10.33 15.73 6.89 0 10.33-5 10.33-15.8C75.05 55.86 71.6 50.86 64.79 50.86z"/><path class="st3" d="M130.89 30.83l-2.27 5.24c-2.66-1.18-5.71-1.72-8.84-1.72 -5.63 0-8.45 2.19-8.45 6.73v8.06h13.92l-0.78 5.56h-13.14v32.56h-7.21V54.7h-9.71v-5.56h9.71v-7.98c0-7.67 6.42-12.61 15.26-12.61C124 28.55 127.6 29.42 130.89 30.83z"/><path class="st3" d="M220.97 87.26h-9.79l-5.08-29.19h-0.31l-5.33 29.19h-9.55l-7.36-41.25h7.2l5.01 35.76h0.32l6.02-30.51h8.07l5.63 30.37h0.32l5.01-35.62h6.88L220.97 87.26z"/><path class="st3" d="M269.62 77.94c0 3.29 1.01 4.54 3.29 5.24l-1.72 5.01c-3.68-0.47-6.58-2.11-7.83-5.79 -2.89 3.91-7.98 5.79-12.98 5.79 -8.3 0-13.62-5.09-13.62-12.75 0-8.54 7.12-13.3 19.64-13.3h6.03v-3.21c0-5.79-3.61-7.98-9.63-7.98 -2.74 0-6.58 0.63-10.8 2.11l-1.88-5.32c5.09-1.88 9.71-2.66 13.78-2.66 10.49 0 15.73 5.08 15.73 13.46V77.94zM262.42 77.08V66.9h-5.64c-8.84 0-12.13 3.21-12.13 8.22 0 5.09 2.51 7.67 7.68 7.67C256.23 82.79 260.07 80.68 262.42 77.08z"/><path class="st3" d="M313 87.26h-28.17V81.7h9.47V51.57h-9.47v-5.56h15.73l0.86 7.91c2.35-5.79 6.89-8.84 11.74-8.84 1.96 0 3.13 0.15 5.48 0.62l-1.33 7.13c-2.03-0.55-3.29-0.71-5.01-0.71 -5.16 0-9.39 5.24-10.8 10.95V81.7H313V87.26z"/><path class="st3" d="M336.72 69.1c0.63 9.15 5.55 13.22 11.82 13.22 3.75 0 7.43-0.95 10.96-3.84l3.28 4.78c-3.84 3.04-9.07 4.93-14.4 4.93 -12.28 0-19.17-8.69-19.17-21.52 0-12.44 7.04-21.59 17.99-21.59 10.81 0 17.3 7.75 17.3 20.34 0 1.41-0.07 2.74-0.16 3.68H336.72zM336.72 63.78h20.82c-0.15-8.54-3.91-13-10.33-13C341.57 50.78 337.27 54.93 336.72 63.78z"/><path class="st3" d="M392.61 84.28v19.02l-12.52 1.33V45.69h11.12l0.54 4.62c3.37-4.31 7.6-6.03 11.51-6.03 10.8 0 15.19 8.54 15.19 22.07 0 12.83-5.87 22.22-15.96 22.22C398.39 88.58 395.11 87.17 392.61 84.28zM405.51 66.51c0-10.33-2.35-12.99-6.34-12.99 -2.66 0-4.78 1.8-6.57 4.78v17.45c1.72 2.5 3.36 3.68 5.95 3.68C402.93 79.43 405.51 75.83 405.51 66.51z"/><path class="st3" d="M439.82 45.69v28.41c0 3.99 1.57 5.24 4.16 5.24 2.5 0 5.24-1.72 6.96-4.46v-29.2h12.51v41.56H452.5l-0.55-4.86c-2.82 4.07-7.75 6.18-12.75 6.18 -8.07 0-11.9-5.01-11.9-12.91V45.69H439.82zM434.73 33.33l16.83-11.27 5.55 9.31 -18.62 8.29L434.73 33.33z"/><path class="st3" d="M489.99 49.93c2.59-3.45 6.5-5.64 10.57-5.64 10.8 0 15.41 8.54 15.41 22.07 0 12.83-5.86 22.22-16.66 22.22 -4.15 0-7.82-1.79-10.25-5.08l-0.47 3.76h-11.12V29.19l12.52-1.33V49.93zM503.07 66.51c0-10.33-2.58-12.99-6.51-12.99 -2.66 0-4.77 1.8-6.57 4.78v17.45c1.57 2.43 3.37 3.75 5.95 3.75C500.33 79.5 503.07 75.83 503.07 66.51z"/><path class="st3" d="M544.64 74.18c0 3.28 2.03 4.54 5.32 4.54 2.11 0 4.15-0.54 5.87-1.26l2.97 8.37c-2.81 1.49-6.73 2.74-12.05 2.74 -10.25 0-14.63-6.26-14.63-16.04V37.71h-12.21v-8.53h24.73V74.18z"/><path class="st3" d="M605.73 87.26H570.9v-8.54h11.73v-24.5h-11.34v-8.53h23.88v33.03h10.56V87.26zM581.47 30.9c0-3.99 3.13-7.04 7.43-7.04 4.31 0 7.44 3.05 7.44 7.04 0 3.99-3.13 7.04-7.44 7.04C584.6 37.95 581.47 34.89 581.47 30.9z"/><path class="st3" d="M647.05 75.59l5.64 7.98c-3.92 3.13-9.31 5.01-15.42 5.01 -13.54 0-21.59-8.83-21.59-21.83 0-13 8.37-22.46 21.75-22.46 6.34 0 11.26 1.88 15.26 5.24l-5.4 7.52c-2.81-2.2-6.18-3.13-9.08-3.13 -5.55 0-9.39 3.52-9.39 12.84 0 9.15 4.15 11.97 9.39 11.97C641.04 78.72 644.16 77.79 647.05 75.59z"/><path class="st3" d="M701.54 66.36c0 13.92-7.52 22.22-20.26 22.22 -12.76 0-20.28-8.13-20.28-22.14 0-13.23 7.53-22.15 20.28-22.15C694.1 44.29 701.54 53.05 701.54 66.36zM673.91 66.44c0 9.15 2.34 12.99 7.36 12.99 5 0 7.35-3.84 7.35-13.06 0-8.93-2.34-12.84-7.35-12.84C676.25 53.52 673.91 57.44 673.91 66.44z"/><path class="st3" d="M171.03 85.14c-2.89 1.87-7.28 3.05-11.35 3.05 -9.08 0-14.08-5.24-14.08-12.75V54.73h-9.4v-5.48h9.4V36.7l7.2-0.86v13.42h14.17l-0.87 5.48h-13.3v20.62c0 4.62 2.19 6.89 7.67 6.89 3.05 0 5.72-0.78 7.83-2.04L171.03 85.14z"/><path class="st3" d="M9.81 21.2c1.28-1.71 3.03-2.69 5.04-2.69 4.74 0 6.66 3.66 6.66 9.21 0 5.38-2.46 9.24-7.03 9.24 -2.05 0-3.63-0.67-4.81-2.22l-0.2 1.85H7.02V11.75l2.79-0.34V21.2zM18.45 27.72c0-4.64-1.45-6.96-4.2-6.96 -1.98 0-3.5 1.45-4.44 2.86v8.81c0.94 1.41 2.39 2.29 4.03 2.29C16.8 34.71 18.45 32.46 18.45 27.72z"/><path class="st3" d="M28.76 28.72c0.13 4.13 2.45 5.92 5.18 5.92 1.61 0 3.19-0.4 4.74-1.65l1.31 1.92c-1.65 1.28-3.87 2.05-6.05 2.05 -5.18 0-8.1-3.7-8.1-9.21 0-5.34 3.03-9.24 7.6-9.24 4.57 0 7.29 3.33 7.29 8.71 0 0.61-0.03 1.14-0.07 1.51H28.76zM28.76 26.57h9.28c-0.07-3.8-1.78-5.75-4.57-5.75C30.94 20.83 28.99 22.67 28.76 26.57z"/><path class="st3" d="M59.21 35.72c-1.21 0.77-3.09 1.24-4.74 1.24 -3.76 0-5.92-2.19-5.92-5.31V21.06h-4.07v-2.15h4.07v-4.03l2.79-0.34v4.37h6.12l-0.34 2.15h-5.78v10.56c0 1.98 0.94 3.03 3.39 3.03 1.31 0 2.42-0.34 3.4-0.84L59.21 35.72z"/><path class="st3" d="M76.77 32.76c0 1.41 0.47 1.95 1.45 2.25l-0.67 1.98c-1.51-0.2-2.72-0.94-3.23-2.52 -1.28 1.65-3.26 2.49-5.55 2.49 -3.56 0-5.71-2.15-5.71-5.45 0-3.63 2.92-5.68 8.3-5.68h2.59v-1.48c0-2.55-1.58-3.5-4.2-3.5 -1.18 0-2.79 0.24-4.61 0.87l-0.74-2.08c2.15-0.81 4.03-1.14 5.75-1.14 4.4 0 6.62 2.22 6.62 5.71V32.76zM73.95 32.32v-4.57h-2.55c-3.93 0-5.34 1.45-5.34 3.73 0 2.22 1.11 3.36 3.43 3.36C71.23 34.84 72.91 33.94 73.95 32.32z"/><path class="st3" d="M737.87 31.54v-9.3h-2.63c-0.76 0-1.35 0.1-1.78 0.31 -0.42 0.21-0.86 0.6-1.31 1.2 -0.45 0.59-1.12 1.74-2.01 3.45l-2.29 4.36h-2.86l3-5.7c0.51-0.98 1.11-1.87 1.79-2.67 0.33-0.39 0.82-0.78 1.46-1.16 -1.57-0.27-2.77-0.89-3.59-1.87 -0.82-0.98-1.24-2.26-1.24-3.84 0-1.2 0.24-2.25 0.73-3.16 0.49-0.91 1.11-1.56 1.87-1.95 0.76-0.39 1.93-0.59 3.52-0.59h7.62v20.95H737.87zM737.87 12.91h-5.43c-1.22 0-2.14 0.3-2.76 0.91 -0.62 0.61-0.93 1.44-0.93 2.49 0 0.73 0.16 1.38 0.49 1.93 0.32 0.55 0.76 0.96 1.31 1.21 0.55 0.26 1.36 0.39 2.43 0.39h4.89V12.91z"/><path class="st3" d="M734.19 4.02c-9.69 0-17.54 7.85-17.54 17.54s7.85 17.54 17.54 17.54 17.54-7.85 17.54-17.54S743.88 4.02 734.19 4.02zM734.19 36.47c-8.24 0-14.92-6.68-14.92-14.92 0-8.24 6.68-14.92 14.92-14.92s14.92 6.68 14.92 14.92C749.11 29.8 742.43 36.47 734.19 36.47z"/></svg>
\ No newline at end of file
diff --git a/colab/templates/base.html b/colab/templates/base.html
index 589ad89..dc0c36d 100644
--- a/colab/templates/base.html
+++ b/colab/templates/base.html
@@ -107,7 +107,6 @@
                   <li><a href="/gitlab/public/projects">{% trans "Public Projects" %}</a></li>
                   {% if user.is_active %}
                     <li><a href="/gitlab/profile">{% trans "Profile" %}</a></li>
-                    <li><a href="/gitlab/projects/new">{% trans "New Project" %}</a></li>
                     <li><a href="/gitlab/dashboard/projects">{% trans "Projects" %}</a></li>
                     <li><a href="/gitlab/profile/groups">{% trans "Groups" %}</a></li>
                     <li><a href="/gitlab/dashboard/issues">{% trans "Issues" %}</a></li>
@@ -128,8 +127,8 @@
                     </a>
                   </li>
                   <li>
-                    <a href="/social/search/communities">
-                      {% trans "Communities" %} 
+                    <a href="/social/search/software_infos">
+                      {% trans "Softwares" %} 
                     </a>
                   </li>
                   {% if user.is_active %}
--
libgit2 0.21.2