Import from dev trunk (last revision 54):
- Fix: #1027381
- Fix: #1027577
- Major changes on light template: Arrotondati molti elemnti, tra cui i badge, i tag, la x in alto a destra per chiudere una notifica (sostituita con una immagine di design.ubuntu.com), le immagini dei profili, sia nei singoli profili che nella lista degli utenti.
Thanks to Riccardo Padonani

- Import from merge proposal lp:~giuseppeterrasi/ubuntu-it-ask/logo-asset-resubmit : remove some unused images and add some stuff such as community logo, logo website and favico.ico

- Fix: #1025006

- Merge from lp:~ricki-padovani/ubuntu-it-ask/pietro
Re-style search bar and sidebar, change sort order in bagde.html
Thanks to Riccardo Padovani and Pietro Albini

00-README

@@ -6,6 +6,10 @@ CHANGE_THIS_PATH is equal to new third level domain url or folder that containin
 
 See RT #19985
 
+= Virtualhost =
+
+See 00-apache_site_avaible_rules.
+
 = Database =
 
 postgres-9.1 is ok. We need:
@@ -39,6 +43,15 @@ sudo chown -R www-data:www-data osqa
 sudo chmod -R g+w /srv/CHANGE_THIS_PATH/www/osqa/forum/upfiles
 sudo chmod -R g+w /srv/CHANGE_THIS_PATH/www/osqa/log
 
+= Import customs settings =
+
+Put 00-forum_keyvalue.sql into osqa database:
+
+1) psql -U ubuntu-it-chiedi ubuntu-it-chiedi -W < forum_keyvalue.sql
+2) python /src/CHANGE_THIS_PATH/www/osqa/manage.py syncdb
+
+(if you need a dump of this table, please use: pg_dump ubuntu-it-chiedi --clean -O -t forum_keyvalue -f forum_keyvalue.sql -U ubuntu-it-chiedi -W )
+
 = Other =
 
 We can perform other changes, if needed, using bzr with no access on

forum/skins/light/media/style/style.css

@@ -192,7 +192,7 @@ blockquote blockquote {
 #wrapper, #announcement {
     margin: auto;
     min-width: 985px;
-    margin: 0 20px;
+    margin: 10px 20px;
 }
 
 #announcement {
@@ -201,12 +201,12 @@ blockquote blockquote {
     margin: 5px 20px;
     height: 35px;
     font-size: 17px;
-    background: none repeat scroll 0 0 rgba(0, 0, 0, 0.6);
+    background: #D7D7D7;
     border-radius: 5px 5px 5px 5px;
     -moz-border-radius: 5px 5px 5px 5px;
     -webkit-border-radius: 5px 5px 5px;
     line-height: 2;
-    color: white;
+    color: black;
 }
 
 .container {
@@ -414,7 +414,7 @@ padding-top: 4px;
 
 #CALeft {
     float: left;
-    width: 84%;
+    width: 83.5%;
     background-color: #e4e4e4;
     padding: 5px;
     border: solid 1px #D4D4D4;
@@ -424,15 +424,11 @@ padding-top: 4px;
 #CARight {
     float: right;
     width: 15%;
-    color: #EEE;
 }
 
 #CARight h3 {
-    background-color: transparent;
-    font-size: 20px;
+    font-size: 18px;
     text-align: center;
-    color: #E0E0E0;
-    text-shadow: 1px 1px 1px #222;
 }
 
 #CARight p {
@@ -591,7 +587,7 @@ padding-top: 4px;
     padding-top: 5px;
     margin-left: 5px;
     margin-bottom: 10px;
-    background: none repeat scroll 0 0 rgba(0, 0, 0, 0.6);
+    background: #D7D7D7;
     border-radius: 5px 5px 5px 5px;
     -moz-border-radius: 5px 5px 5px 5px;
     -webkit-border-radius: 5px 5px 5px;
@@ -633,6 +629,9 @@ padding-top: 4px;
     color: #777777;
     font: bold 100% sans-serif;
     padding: 2px 4px 3px;
+    border-radius: 3px;
+    -moz-border-radius: 3px;
+    -webkit-border-radius: 3px;
 }
 
 .paginator .prev {
@@ -645,11 +644,14 @@ padding-top: 4px;
 
 .paginator .page, .paginator .page a:visited, .paginator .curr {
     background-color: white;
-    border: 1px solid #DD4818;
+    border: 1px solid white;
     color: #DD4818;
     font: 0.875em Ubuntu;
     margin: 0 0.25em;
     padding: 0.25em;
+    border-radius: 3px;
+    -moz-border-radius: 3px;
+    -webkit-border-radius: 3px;
 }
 
 .paginator .curr {
@@ -702,6 +704,9 @@ padding-top: 4px;
     padding: 1px 8px;
     text-decoration: none;
     white-space: nowrap;
+    border-radius: 3px;
+    -moz-border-radius: 3px;
+    -webkit-border-radius: 3px;
 }
 
 .tags a:hover, .tags-summary a:hover {
@@ -727,6 +732,10 @@ padding-top: 4px;
     font-weight: bold;
     line-height: 250%;
     padding: 4px 12px 4px 6px;
+    border: 1px solid #DD4818;
+    border-radius: 3px;
+    -moz-border-radius: 3px;
+    -webkit-border-radius: 3px;
 }
 
 a.medal {
@@ -735,10 +744,13 @@ a.medal {
 }
 
 a.medal:hover {
-    /*background: url("../images/medala_on.gif") no-repeat scroll 0 0 transparent;*/
     background-color: white;
     color: #DD4818;
     text-decoration: none;
+    border: 1px solid white;
+    border-radius: 3px;
+    -moz-border-radius: 3px;
+    -webkit-border-radius: 3px;
 }
 
 .tabBar {
@@ -788,6 +800,9 @@ a.medal:hover {
 .tabsA a.on, .tabsA a:hover {
     background: none repeat scroll 0 0 #FFFFFF;
     color: #DD4818;
+    border-radius: 3px;
+    -moz-border-radius: 3px;
+    -webkit-border-radius: 3px;
 }
 
 .tabsA a:hover {
@@ -1234,6 +1249,9 @@ ins {
     text-align: center;
     text-decoration: none;
     width: 20px;
+    border-radius: 50%;
+    -moz-border-radius: 50%;
+    -webkit-border-radius: 50%;
 }
 
 .vote-count {
@@ -1364,22 +1382,42 @@ ins {
 }
 
 #searchBar .searchInput {
-    border: 3px solid #D7D7D7;
+    border: 1px solid #D7D7D7;
     padding: 3px;
     font-size: 13px;
     height: 18px;
     width: 380px;
 }
 
+#searchBar .searchInputGrey {
+    border: 1px solid #D7D7D7;
+    padding: 3px;
+    font-size: 13px;
+    height: 18px;
+    width: 380px;
+    color: #E7E7E7;
+    font-style: italic;
+}
+
 #searchBar .searchInput:focus {
-    border: 3px solid #DD4818;
-    outline: none;
+    outline: medium none;
+	border: 1px solid #DD4818;
 }
 
 #searchBar .searchBtn {
-    font-size: 14px;
-    height: 26px;
-    width: 80px;
+    background-color: inherit;
+    background-image: url(../images/light/icon-search.png);
+    vertical-align: middle;
+    cursor: pointer;
+    width: 22px;
+    height: 22px;
+    background-repeat: no-repeat;
+    background-position: center;
+    border-style: none;
+}
+
+#searchBar .searchBtn:hover {
+    background-image: url(../images/light/icon-search-hover.png);
 }
 
 #searchBar .options {
@@ -1428,6 +1466,10 @@ padding: 6px;
     border: 1px solid #DD4814;
     margin: 10px 0;
     padding: 5px;
+    border-radius: 4px;
+    -webkit-border-radius: 4px;
+    -moz-border-radius: 4px;
+    -khtml-border-radius: 4px;
 }
 
 .message p {
@@ -1443,16 +1485,21 @@ padding: 6px;
 
 .submit {
     background-color: white;
-    border: 2px solid #DD4814;
+	border: 1px solid rgb(221, 72, 20);
 	cursor: pointer;
 	font-size: 120%;
 	font-weight: bold;
-    height: 40px;
-    padding-bottom: 4px;
+	height: 30px;
+	border-radius: 4px;
+	-webkit-border-radius: 4px;
+    -moz-border-radius: 4px;
+    -khtml-border-radius: 4px;
 }
 
 .submit:hover {
-    text-decoration: underline;
+    background: none repeat scroll 0% 0% rgb(221, 72, 20);
+	color: rgb(255, 255, 255);
+	text-decoration: none;
 }
 
 .ask-body {
@@ -1487,17 +1534,22 @@ padding: 6px;
     margin-top: 5px;
 }
 
+.gravatar {
+    border-radius: 50%;
+    -moz-border-radius: 50%;
+    -webkit-border-radius: 50%;
+}
+
 #close-notify {
-    border: 2px solid white;
-    color: white;
     cursor: pointer;
-    font-size: 14px;
-    line-height: 18px;
     padding: 0 3px;
     position: absolute;
     right: 5px;
-    text-decoration: none;
     top: 5px;
+    background-image: url(../images/light/pictogram-delete-white.png);
+    background-repeat: no-repeat;
+    height: 20px;
+    width: 20px;
 }
 
 #close-notify:hover {
@@ -2201,8 +2253,9 @@ div.wmd-button-bar {
 }
 
 #error > h1 {
-    color: white;
-    background-color: #DD4818;
+    color: #ffffff;
+	background-color: rgb(221, 72, 24);
+	border-radius: 4px;
 }
 
 #error {

forum/skins/light/media/style/user.css

@@ -14,8 +14,9 @@
 #user-menu-dropdown {
     position: absolute;
     background-color: #EEEEEE;
-    -moz-border-radius: 5px;
-    -webkit-border-radius: 5px;
+    border: 1px solid rgb(221, 72, 20);
+    -moz-border-radius: 4px 0 4px 4px;
+    -webkit-border-radius: 4px 0 4px 4px;
     -moz-box-shadow: 2px 2px 5px #DD4818;
     -webkit-box-shadow: 2px 2px 5px #DD4818;
 }

forum/skins/light/templates/badge.html

@@ -30,7 +30,7 @@
     </div>
     <div id="award-list" style="clear:both;margin-left:20px;line-height:25px;">
         {% for award in awards %}
-        <p style="width:220px;float:left">{% user_signature award.user "badges" %}<span class="tag-number"> &#215; {{ award.count|intcomma }}</span></p>
+        <p style="width:250px;float:left;margin-bottom:5px;">{% user_signature award.user "badges" %}<span class="tag-number"> &#215; {{ award.count|intcomma }}</span></p><br/>
         {% endfor %}
     </div>
 </div>

forum/skins/light/templates/base_content.html

@@ -147,7 +147,7 @@
                     {% endfor %}
                 {% endif %}
             {% endautoescape %}
-            <a id="close-notify" onclick="notify.close(true)">&#215;</a>
+            <a id="close-notify" onclick="notify.close(true)"></a>
         </div>
     </body>
 </html>

forum/skins/light/templates/header.html

@@ -48,7 +48,7 @@
                         
                         <div id="sub_header_search">
                             <input type="text" class="searchInput" value="{{ keywords }}" name="q" id="keywords" />
-                            <input type="submit" name="Submit" value="{% trans "search" %}" class="searchBtn" />
+                            <button name="Submit" class="searchBtn" ></button>
                         </div>
                     </form>	
                 </div>

forum/skins/light/templates/question_list/count.html

@@ -5,22 +5,19 @@
 {% enddeclare %}
 
 <div class="boxC">
+    <h3>{{ questions.paginator.sort_description }}</h3>
+
     <div class="questions-count">
-        {{ questions.paginator.count }}<span style="color:#EEE;font-size:14px;margin-left:5px;text-shadow: 1px 1px 1px #222;">{{ list_description }}</span>
+        {{ questions.paginator.count }}<span style="font-size:14px;margin-left:5px;">{{ list_description }}</span>
     </div>
 
 
     {% if answer_count %}
     <div class="questions-count">
-        {{ answer_count }}<span style="color:#EEE;font-size:14px;margin-left:5px;text-shadow: 1px 1px 1px #222;">{% trans "answers" %}</span>
+        {{ answer_count }}<span style="font-size:14px;margin-left:5px;">{% trans "answers" %}</span>
     </div>
 
     {% endif %}
 
-    <div>
-        <p class="nomargin">
-            {{ questions.paginator.sort_description }}
-        </p>
-    </div>
 </div>
 {% endspaceless %}

rmpyc

-rm `find . -name '*.pyc'`