Browse Source

Merge pull request #2450 from v1kku/fix/product-select-width

Add a css class to set the ProductSelect widget width
master
Samir Shah 8 years ago
parent
commit
a651dd076e

+ 0
- 4
src/oscar/apps/dashboard/catalogue/forms.py View File

323
             'recommendation': ProductSelect,
323
             'recommendation': ProductSelect,
324
         }
324
         }
325
 
325
 
326
-    def __init__(self, *args, **kwargs):
327
-        super(ProductRecommendationForm, self).__init__(*args, **kwargs)
328
-        self.fields['recommendation'].widget.attrs['class'] = "select2"
329
-
330
 
326
 
331
 class ProductClassForm(forms.ModelForm):
327
 class ProductClassForm(forms.ModelForm):
332
 
328
 

+ 4
- 0
src/oscar/apps/dashboard/catalogue/widgets.py View File

8
     # AjaxSelect(data_url=...) for overridability and backwards compatibility
8
     # AjaxSelect(data_url=...) for overridability and backwards compatibility
9
     lookup_url = reverse_lazy('dashboard:catalogue-product-lookup')
9
     lookup_url = reverse_lazy('dashboard:catalogue-product-lookup')
10
 
10
 
11
+    def __init__(self, *args, **kwargs):
12
+        super(ProductSelect, self).__init__(*args, **kwargs)
13
+        self.attrs['class'] = 'select2 product-select'
14
+
11
 
15
 
12
 class ProductSelectMultiple(MultipleRemoteSelect):
16
 class ProductSelectMultiple(MultipleRemoteSelect):
13
     # Implemented as separate class instead of just calling
17
     # Implemented as separate class instead of just calling

+ 0
- 8
src/oscar/apps/dashboard/promotions/forms.py View File

37
         fields = ['name', 'product', 'description']
37
         fields = ['name', 'product', 'description']
38
         widgets = {'product': ProductSelect}
38
         widgets = {'product': ProductSelect}
39
 
39
 
40
-    def __init__(self, *args, **kwargs):
41
-        super(SingleProductForm, self).__init__(*args, **kwargs)
42
-        self.fields['product'].widget.attrs['class'] = "select2 input-xlarge"
43
-
44
 
40
 
45
 class HandPickedProductListForm(forms.ModelForm):
41
 class HandPickedProductListForm(forms.ModelForm):
46
     class Meta:
42
     class Meta:
56
             'product': ProductSelect,
52
             'product': ProductSelect,
57
         }
53
         }
58
 
54
 
59
-    def __init__(self, *args, **kwargs):
60
-        super(OrderedProductForm, self).__init__(*args, **kwargs)
61
-        self.fields['product'].widget.attrs['class'] = "select2 input-xlarge"
62
-
63
 
55
 
64
 class PagePromotionForm(forms.ModelForm):
56
 class PagePromotionForm(forms.ModelForm):
65
     page_url = ExtendedURLField(label=_("URL"))
57
     page_url = ExtendedURLField(label=_("URL"))

+ 6
- 0
src/oscar/static/oscar/css/dashboard.css View File

3419
 .navbar-form .control-group {
3419
 .navbar-form .control-group {
3420
   margin-right: 10px;
3420
   margin-right: 10px;
3421
 }
3421
 }
3422
+.navbar-form .product-select {
3423
+  width: 270px;
3424
+}
3422
 .navbar-form .help-block,
3425
 .navbar-form .help-block,
3423
 .navbar-form .error-block {
3426
 .navbar-form .error-block {
3424
   display: inline-block;
3427
   display: inline-block;
5660
 .form-inline .control-group {
5663
 .form-inline .control-group {
5661
   margin-right: 10px;
5664
   margin-right: 10px;
5662
 }
5665
 }
5666
+.form-inline .product-select {
5667
+  width: 270px;
5668
+}
5663
 .create-page .form-horizontal input[type=text],
5669
 .create-page .form-horizontal input[type=text],
5664
 .create-page .form-stacked input[type=text],
5670
 .create-page .form-stacked input[type=text],
5665
 .create-page .form-horizontal input[type=number],
5671
 .create-page .form-horizontal input[type=number],

+ 3
- 0
src/oscar/static/oscar/less/dashboard/forms.less View File

48
   .control-group {
48
   .control-group {
49
     margin-right: 10px;
49
     margin-right: 10px;
50
   }
50
   }
51
+  .product-select{
52
+    width: 270px;
53
+  }
51
 }
54
 }
52
 
55
 
53
 .create-page {
56
 .create-page {

Loading…
Cancel
Save