← Back to branch summary

~ubuntu-branches/ubuntu/lucid/software-center/lucid

« back to all changes in this revision

Viewing changes to data/templates/AppDetailsView.html

  • Committer: Bazaar Package Importer
  • Author(s): Michael Vogt, Gary Lasker, Michael Vogt
  • Date: 2010-03-11 16:58:00 UTC
  • Revision ID: james.westby@ubuntu.com-20100311165800-t1x7nerqb5dxjyeq
Tags: 1.1.17
https://launchpad.net/bugs/531689
https://launchpad.net/bugs/531780
https://launchpad.net/bugs/531820
https://launchpad.net/bugs/531694
https://launchpad.net/bugs/531798
http://bugs.debian.org/572941
[ Gary Lasker ]
* softwarecenter/view/navhistory.py:
  - unescape the nav button label text (LP: #531689)
  - fix up and just use a single __str__ method (LP: #531780)
* softwarecenter/view/availablepane.py,
  softwarecenter/view/channelpane.py:
  - fix intermittent AttributeError when a previous
    model does not exist when refreshing the apps view
    (LP: #531820)

[ Michael Vogt ]
* merged lp:~mpt/software-center/bug-499893 (thanks)
* merged lp:~mpt/software-center/categorization (thanks)
* merged lp:~michaelforrest/software-center/ui-changes (thanks)
* data/icons/scalable/apps/partner.svg:
  - add partner icon (LP: #531694)
* softwarecenter/view/catview.py:
  - do not show header in subsection view
* softwarecenter/view/availablepane.py:
  - fix race in initial part creation (LP: #531798)
* debian/control:
  - add gnome-app-install transitional package (closes: #572941)

Show diffs side-by-side

added added

removed removed

Lines of Context:
data/templates/AppDetailsView.html
35
35
    obj.style.width=progress+"px";
36
36
  }
37
37
  function thumbMissing() {
 
38
    return;
38
39
    obj=document.getElementById("screenshot_thumbnail_img"); 
39
40
    obj.style.background= 'url("file:$screenshot_thumbnail_missing")';
40
41
    obj.style.visibility = 'visible';
77
78
      font-weight:${font_weight};
78
79
      font-style:${font_style};
79
80
    }
80
 
    body.section-get {
81
 
      background-color:#b6bdc4; 
82
 
      color: #000;
83
 
    }
 
81
    #wrap{ width:500px; margin:0 auto; }
 
82
    #header{ padding-left:76px }
84
83
    h1 {
85
84
      font-size:140%; 
86
 
      margin: 0 0 1em;
 
85
      margin: 0 0 0.1em;
 
86
    }
 
87
    h2 {
 
88
      font-size:80%;
 
89
      margin:0 0 0.3em 0;
 
90
      font-weight:normal;
87
91
    }
88
92
    #description {
89
93
      font-size: 80%;
 
94
      clear:left;
90
95
    }
91
96
    #icon {
 
97
      margin-left:-76px;
92
98
      width:64px;
93
99
      height:64px;
94
100
      z-index:-1;
100
106
    }
101
107
 
102
108
    .screenshot_thumbnail {
103
 
      width:160px; 
104
 
      height:120px;
 
109
      margin-top:1em;
 
110
      width:500px; 
 
111
      height:375px;
105
112
      -khtml-user-drag:none;
106
113
    }
107
114
    #screenshot_thumbnail_loading {
108
 
    background: url('file:$iconpath_loading') 50% 50% no-repeat;
109
 
      float:right;
110
 
      margin: 0 0 1em 1em;
 
115
      background: url('file:$iconpath_loading') 50% 50% no-repeat;
 
116
      -webkit-box-shadow: rgba(0, 0, 0, 0.4) -4px 2px 10px;
111
117
    }
112
118
    #screenshot_thumbnail {
113
119
      visibility:hidden; 
114
 
      background-color:#b6bdc4;
 
120
      background-color:#FFF;
 
121
      
115
122
    }
116
123
    #screenshot_thumbnail-installed {
117
124
      visibility:hidden; 
118
125
      background-color:#fff; 
119
126
    }
120
127
    #screenshot_thumbnail_img {
 
128
      width:500px; 
 
129
      height:375px;
121
130
      visibility:hidden; 
122
 
      background:url('${screenshot_thumbnail_url}') no-repeat;
 
131
      background:url('${screenshot_large_url}') no-repeat;
123
132
      cursor: -webkit-zoom-in
124
 
      float:right;
125
133
      text-align:center;
126
134
      vertical-align:middle;
127
 
      display:table-cell;
128
135
    }
129
136
    .screenshot_a {
130
137
      text-decoration:none;
131
138
      color:grey;
132
139
    }
133
 
    #text {
134
 
      float:left; 
135
 
      padding-left:86px;
 
140
    
 
141
    #installed_icon {       
 
142
      visibility:${installed};
 
143
      -khtml-user-drag:none;
 
144
      vertical-align:middle;
136
145
    }
137
 
    #installed_overlay { 
138
 
      z-index:999; 
139
 
      width:24px;
140
 
      height:24px;
141
 
      background: 
142
 
      url('file:${software_installed_icon}'); 
143
 
      position:absolute; 
144
 
      left:40px; 
145
 
      top:40px; 
146
 
      visibility:${installed} 
 
146
    #install_info{
 
147
      padding:0;
 
148
      margin:0;
 
149
      font-size:70%; 
147
150
    }
148
151
    #package_information { 
149
152
      font-size:70%; 
158
161
      font-size:70%; 
159
162
    }
160
163
    #button_homepage { 
161
 
      visibility:${homepage_button_visibility}; 
 
164
      display:block;
 
165
      visibility:${homepage_button_visibility};
 
166
      border:0;
 
167
      background:0;
 
168
      text-decoration:underline;
 
169
      font-size:80%; 
 
170
      padding:0;
 
171
      margin:1em 0;
162
172
    }
 
173
    
163
174
    #action_progress_total {
164
175
       visibility:hidden;
165
176
       border-style: solid;
173
184
       background-color: #ff0000;
174
185
       height:16px;
175
186
    } 
176
 
    #action_button_description { 
177
 
      font-size:70%; 
178
 
    }
 
187
    
179
188
    .action_button { 
 
189
      margin-left:0;
 
190
      margin-top:0.1em;
180
191
      visibility:${action_button_visible}; 
181
192
    }
 
193
    #meta{ color: #AAA; width:100%;}
 
194
    #meta td{width:50%}
 
195
    #package_information{ text-align:right; }
182
196
 </style>
183
197
 
184
198
 </head>
185
199
 
186
200
<body class="${body_class}">
187
 
 
188
 
    <div id="icon">
189
 
      <div id="installed_overlay"></div>
190
 
    </div>
191
 
 
192
 
 <div id="text">
193
 
   <h1>$appname</h1>
194
 
   <div id='screenshot_thumbnail_loading' class='screenshot_thumbnail'>
195
 
        <div id='$screenshot_installed' class='screenshot_thumbnail'>
196
 
            <a href="#" onclick='changeTitle("call:on_screenshot_thumbnail_clicked")' class="screenshot_a">
197
 
            <div id="screenshot_thumbnail_img" class="screenshot_thumbnail">
198
 
                <span id="screenshot_thumbnail_img_missing"/>
199
 
            </div>
200
 
            </a>
201
 
        </div>
202
 
   </div>
203
 
   <div id="description">$description</div>
204
 
   <p id="license">$license</p>
205
 
   <p id="price">$price</p>
206
 
   <p id="action_button_description">$action_button_description</p>
207
 
   <div id="action_progress_total"><div id="action_progress"></div></div>
208
 
   <input type="button" id="button_${action_button_value}" 
 
201
  <div id="wrap">
 
202
  <div id="header">
 
203
      <div id="icon">
 
204
        
 
205
      </div>
 
206
     <h1>$appname</h1>
 
207
     <h2>$summary</h2>
 
208
     <input type="button" id="button_${action_button_value}" 
209
209
          class="action_button"
210
210
          value="$action_button_label"
211
 
          onclick='action_button_clicked()'
212
 
          />
 
211
          onclick='action_button_clicked()'
 
212
      />
 
213
      <label for="button_${action_button_value}" id="install_info">
 
214
        <img id="installed_icon" src="file:${software_installed_icon}"/> $action_button_description
 
215
      </label>
 
216
      <div id="action_progress_total"><div id="action_progress"></div></div>
 
217
   </div>
 
218
    
213
219
   
 
220
   <div id="description">$description</div>
214
221
   <input type="button" id="button_homepage" value="$homepage"
215
 
          onclick='changeTitle("call:on_button_homepage_clicked")'
216
 
          />
217
 
   <p id="package_information">$package_information</p>
 
222
    onclick='changeTitle("call:on_button_homepage_clicked")'
 
223
    />
 
224
 
 
225
  <div id='screenshot_thumbnail_loading' class='screenshot_thumbnail'>
 
226
     <div id='$screenshot_installed' class='screenshot_thumbnail'>
 
227
        <a href="#" onclick='changeTitle("call:on_screenshot_thumbnail_clicked")' class="screenshot_a">
 
228
         <div id="screenshot_thumbnail_img" class="screenshot_thumbnail">
 
229
            <span id="screenshot_thumbnail_img_missing"/>
 
230
         </div>
 
231
        </a>
 
232
     </div>
 
233
   </div>
 
234
 
218
235
   <p id="maintainance_time">$maintainance_time</p>
219
 
 </div>
220
 
 
 
236
  
 
237
   <table id="meta">
 
238
     <tr>
 
239
       <td id="license">$license</td>   
 
240
       <td id="package_information">$package_information</td>
 
241
     </td>
 
242
   </table>
 
243
  </div>
221
244
 
222
245
</body>
223
246
</html>