From oi-svn at pardus.org.tr  Thu Dec  3 16:47:16 2009
From: oi-svn at pardus.org.tr (=?utf-8?q?Eren_T=C3=BCrkay?=)
Date: Thu,  3 Dec 2009 16:47:16 +0200 (EET)
Subject: [Oi-commits] trunk/shop - disable shop,
	add *.orig files that used to work..
Message-ID: <20091203144716.745E649C916@ns1.pardus.org.tr>

Author: erenturkay
Date: Thu Dec  3 16:47:16 2009
New Revision: 2890

Added:
   trunk/shop/templates/shop_base.html.orig
   trunk/shop/templates/shop_main.html.orig
Modified:
   trunk/shop/templates/shop_base.html
   trunk/shop/templates/shop_main.html
   trunk/shop/urls.py
Log:
* disable shop, add *.orig files that used to work..

---
 templates/shop_base.html      |   29 -----------------------------
 templates/shop_base.html.orig |   38 ++++++++++++++++++++++++++++++++++++++
 templates/shop_main.html      |   15 +++------------
 templates/shop_main.html.orig |   15 +++++++++++++++
 urls.py                       |    8 ++++----
 5 files changed, 60 insertions(+), 45 deletions(-)

Modified: trunk/shop/templates/shop_base.html
=================================================================
--- trunk/shop/templates/shop_base.html	(original)
+++ trunk/shop/templates/shop_base.html	Thu Dec  3 16:47:16 2009
@@ -6,33 +6,4 @@
 <style type="text/css" media="screen">@import url('/media/css/new/shop.css');</style>
 <script type="text/javascript" src="/media/js/shop.js"></script>
 {% endblock %}
-{% block leftcolumn %}
-<div class="sidebarcolumn leftcolumn">
-    <div class="leftcolumn_content">
-        <img src="/media/img/new/cart_title.png" alt="sepetinizde bulunan ?r?nler" />
-        {% if user.is_authenticated %}
-        {% if user.get_profile.have_shopprofile %}
-        <div id="cart">
-            {% get_cart user %}
-            <a href="/dukkan/profil/">Al??veri? Profili</a>
-        </div>
-        {% else %}
-        <p>Sepeti kullanabilmek i?in ?ncelikle bir al??veri? profili olu?turmal?s?n?z. <a href="/dukkan/profil/olustur/" style="color: #009FE0">Buraya</a> t?klayarak profilinizi olu?turabilir ve ?r?n sipari?i vermeye ba?layabilirsiniz.</p>
-        {% endif %}
-        {% else %}
-        <p>Sepeti kullanabilmek i?in sa?daki kullan?c? kutusundan giri? yapmal?s?n?z.</p>
-        {% endif %}
-    </div>
-    <div class="leftcolumn_content">
-        <div class="shop_category">?r?nler</div>
-        {% category_tree %}
-    </div>
-    <div class="leftcolumn_content">
-        <div class="shop_category">E-D?kkan Hakk?nda</div>
-        <ul>
-            <li><a href="/beden_tablosu/">Beden Tablosu</a></li>
-        </ul>
-    </div>
-</div>
-{% endblock %}
 {% block sidebar_bottom %}{% endblock %}

Modified: trunk/shop/templates/shop_main.html
=================================================================
--- trunk/shop/templates/shop_main.html	(original)
+++ trunk/shop/templates/shop_main.html	Thu Dec  3 16:47:16 2009
@@ -1,15 +1,6 @@
 {% extends "shop_base.html" %}
 {% block content %}
-    <div id="shop_intro"><div class="title">Pardus 2008 t-shirtleri haz?r</div><div class="text">T-shirtleri e-d?kk?n?m?zdan se?ip sat?n alabilirsiniz.</div></div>
-    <div id="product_list">
-    {% for product in products %}
-        {% if not product.parent %}
-        <div class="product_item rightborder">
-            <div class="photo"><a href="{{ product.get_absolute_url }}"><img src="{{ product.images.all.0.picture.url }}" alt="{{ product }}" /></a></div>
-            <div class="title">{{ product }}</div>
-            <div class="button"><a href="{{ product.get_absolute_url }}"><img src="/media/img/new/shop/button_buy.png" alt="Sat?n Al" /></a></div>
-        </div>
-        {% endif %}
-    {% endfor %}
-    </div>
+<br /><br />
+<center>?zg?n?z... E-D?kkan, yap?land?rma ?al??malar?ndan ard?ndan tekrar hizmete girecektir.</center>
+
 {% endblock %}

Modified: trunk/shop/urls.py
=================================================================
--- trunk/shop/urls.py	(original)
+++ trunk/shop/urls.py	Thu Dec  3 16:47:16 2009
@@ -11,11 +11,11 @@
         # Home page
         (r'^$', 'main.views.home'),
         # Profile
-        (r'^profil/', include('oi.shop.shopprofile.urls')),
+        #(r'^profil/', include('oi.shop.shopprofile.urls')),
         # Shopping Cart
-        (r'^sepet/', include('oi.shop.cart.urls')),
+        #(r'^sepet/', include('oi.shop.cart.urls')),
         # Category
-        (r'^kategori/(?P<slug>.*)/$', 'product.views.get_category_products'),
+        #(r'^kategori/(?P<slug>.*)/$', 'product.views.get_category_products'),
         # Product
-        (r'^urun/(?P<category_slug>.*)/(?P<product_slug>.*)/$', 'product.views.get_product'),
+        #(r'^urun/(?P<category_slug>.*)/(?P<product_slug>.*)/$', 'product.views.get_product'),
         )

From oi-svn at pardus.org.tr  Wed Dec  9 18:55:14 2009
From: oi-svn at pardus.org.tr (=?utf-8?b?VcSfdXIgw4dldGlu?=)
Date: Wed,  9 Dec 2009 18:55:14 +0200 (EET)
Subject: [Oi-commits] trunk/templates - remove shop links
Message-ID: <20091209165514.D95F849C93F@ns1.pardus.org.tr>

Author: jnmbk
Date: Wed Dec  9 18:55:14 2009
New Revision: 2891

Modified:
   trunk/templates/footer.html
   trunk/templates/menu.html
Log:
remove shop links

---
 footer.html |    2 +-
 menu.html   |    2 --
 2 files changed, 1 insertion(+), 3 deletions(-)

Modified: trunk/templates/footer.html
=================================================================
--- trunk/templates/footer.html	(original)
+++ trunk/templates/footer.html	Wed Dec  9 18:55:14 2009
@@ -9,6 +9,6 @@
     <div class="footer_right">
         <div class="column" style="width:91px"><a href="/ia/">?lk Ad?mlar</a><br /><a href="/nasil/">Nas?l</a><br /><a href="/paket/">Paketler</a><br /><a href="/oyun/">Oyunlar</a></div>
         <div class="column"><a href="/haber/">Haberler</a><br /><a href="/yenifikir/">Beyin</a><br /><a href="/gezegen/">Gezegen</a><br /><a href="/tema/">Temalar</a></div>
-        <div class="column"><a href="/forum/">Forum</a><br /><a href="/atolye/">At?lye</a><br /><a href="/dukkan/">E-D?kkan</a></div>
+        <div class="column"><a href="/forum/">Forum</a><br /><a href="/atolye/">At?lye</a></div>
     </div>
 </div>

Modified: trunk/templates/menu.html
=================================================================
--- trunk/templates/menu.html	(original)
+++ trunk/templates/menu.html	Wed Dec  9 18:55:14 2009
@@ -21,8 +21,6 @@
     <a title="Pardus ile ilgili destek alabilece?iniz forum alan?" href="/forum/"><img src="/media/img/new/menu/forum.png" alt="Forum"/></a>
     <img src="/media/img/new/menu/spacer2.png" alt=" "/>
     <a title="Pardus yaz?l?m geli?tirme at?lyesi" href="/atolye/" ><img src="/media/img/new/menu/atolye.png" alt="At?lye"/></a>
-    <img src="/media/img/new/menu/spacer2.png" alt=" "/>
-    <a href="/dukkan/" title="G?zel ?eyler giymenizi istiyoruz"><img src="/media/img/new/menu/shop.png" alt="E-Ma?aza"/></a>
     <img src="/media/img/new/menu/bottom.png" alt=" "/>
     </div>
 </div>